Skip to content

Commit 96f2d89

Browse files
committed
fix checkers; remove ifdef in generator ITs
1 parent 8337f78 commit 96f2d89

File tree

4 files changed

+5
-12
lines changed

4 files changed

+5
-12
lines changed

BUILD.bazel

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,4 @@ cc_library(
253253
deps = [
254254
"//google/cloud:google_cloud_cpp_universe_domain",
255255
],
256-
)
257-
258-
256+
)

generator/integration_tests/tests/request_id_tracing_stub_test.cc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
16-
1715
#include "generator/integration_tests/golden/v1/internal/request_id_tracing_stub.h"
1816
#include "generator/integration_tests/golden/v1/internal/request_id_connection_impl.h"
1917
#include "generator/integration_tests/golden/v1/internal/request_id_option_defaults.h"
@@ -213,6 +211,4 @@ TEST(RequestIdTracingStubTest, Lro) {
213211
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
214212
} // namespace golden_v1
215213
} // namespace cloud
216-
} // namespace google
217-
218-
#endif // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
214+
} // namespace google

google/cloud/bigtable/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,8 @@ target_link_libraries(
299299
gRPC::grpc++
300300
gRPC::grpc
301301
protobuf::libprotobuf)
302-
target_compile_definitions(
303-
google_cloud_cpp_bigtable
304-
PRIVATE GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS)
302+
target_compile_definitions(google_cloud_cpp_bigtable
303+
PRIVATE GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS)
305304
target_link_libraries(google_cloud_cpp_bigtable
306305
PUBLIC google-cloud-cpp::opentelemetry)
307306
set(EXTRA_MODULES "google_cloud_cpp_opentelemetry" "opentelemetry_metrics")

google/cloud/testing_util/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ cc_library(
4646
"@googletest//:gtest_main",
4747
"@opentelemetry-cpp//exporters/memory:in_memory_span_exporter",
4848
"@opentelemetry-cpp//sdk/src/trace",
49-
]
49+
],
5050
)
5151

5252
cc_library(

0 commit comments

Comments
 (0)