diff --git a/exporters/otlp/BUILD b/exporters/otlp/BUILD index 0364ce1011..0e5d6909f6 100644 --- a/exporters/otlp/BUILD +++ b/exporters/otlp/BUILD @@ -46,32 +46,17 @@ cc_library( ], ) -cc_library( - name = "otlp_grpc_utils", - srcs = [ - "src/otlp_grpc_utils.cc", - ], - hdrs = [ - "include/opentelemetry/exporters/otlp/otlp_grpc_utils.h", - ], - strip_include_prefix = "include", - tags = ["otlp"], - deps = [ - "//api", - "//sdk:headers", - "@com_github_grpc_grpc//:grpc++", - ], -) - cc_library( name = "otlp_grpc_client", srcs = [ "src/otlp_grpc_client.cc", + "src/otlp_grpc_utils.cc", ], hdrs = [ "include/opentelemetry/exporters/otlp/otlp_environment.h", "include/opentelemetry/exporters/otlp/otlp_grpc_client.h", "include/opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h", + "include/opentelemetry/exporters/otlp/otlp_grpc_utils.h", "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h", "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h", ], @@ -111,7 +96,6 @@ cc_library( deps = [ ":otlp_recordable", ":otlp_grpc_client", - ":otlp_grpc_utils", "//ext:headers", "//sdk/src/trace", diff --git a/exporters/otlp/CMakeLists.txt b/exporters/otlp/CMakeLists.txt index a894af7374..7cecab0eca 100644 --- a/exporters/otlp/CMakeLists.txt +++ b/exporters/otlp/CMakeLists.txt @@ -2,7 +2,7 @@ add_library( opentelemetry_otlp_recordable src/otlp_log_recordable.cc src/otlp_recordable.cc src/otlp_populate_attribute_utils.cc src/otlp_recordable_utils.cc - src/otlp_metric_utils.cc src/otlp_grpc_utils.cc) + src/otlp_metric_utils.cc) set_target_properties(opentelemetry_otlp_recordable PROPERTIES EXPORT_NAME otlp_recordable) @@ -24,7 +24,8 @@ target_link_libraries(opentelemetry_otlp_recordable if(WITH_OTLP_GRPC) find_package(gRPC REQUIRED) - add_library(opentelemetry_exporter_otlp_grpc_client src/otlp_grpc_client.cc) + add_library(opentelemetry_exporter_otlp_grpc_client src/otlp_grpc_client.cc + src/otlp_grpc_utils.cc) set_target_properties(opentelemetry_exporter_otlp_grpc_client PROPERTIES EXPORT_NAME otlp_grpc_client) target_link_libraries(