Extract foo library into a separate library (#1043)

open-telemetry · Oct 30, 2021 · af75379 · af75379
1 parent 838d962
commit af75379
Show file tree

Hide file tree

Showing 29 changed files with 69 additions and 282 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(common)
+include_directories(common)
 if(WITH_OTLP_GRPC OR WITH_OTLP_HTTP)
   add_subdirectory(otlp)
   add_subdirectory(grpc)

diff --git a/examples/common/CMakeLists.txt b/examples/common/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(foo_library)
diff --git a/examples/common/foo_library/BUILD b/examples/common/foo_library/BUILD
@@ -0,0 +1,16 @@
+package(default_visibility = ["//visibility:public"])
+
+cc_library(
+    name = "common_foo_library",
+    srcs = [
+        "foo_library.cc",
+    ],
+    hdrs = [
+        "foo_library.h",
+    ],
+    defines = ["BAZEL_BUILD"],
+    deps = [
+        "//api",
+        "//sdk:headers",
+    ],
+)
diff --git a/examples/common/foo_library/CMakeLists.txt b/examples/common/foo_library/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(common_foo_library foo_library.h foo_library.cc)
+target_link_libraries(common_foo_library PUBLIC ${CMAKE_THREAD_LIBS_INIT}
+                                                opentelemetry_api)
diff --git a/examples/jaeger/foo_library/foo_library.cc → examples/common/foo_library/foo_library.cc b/examples/jaeger/foo_library/foo_library.cc → examples/common/foo_library/foo_library.cc
diff --git a/examples/jaeger/foo_library/foo_library.h → examples/common/foo_library/foo_library.h b/examples/jaeger/foo_library/foo_library.h → examples/common/foo_library/foo_library.h
diff --git a/examples/jaeger/BUILD b/examples/jaeger/BUILD
@@ -1,25 +1,11 @@
-cc_library(
-    name = "foo_library",
-    srcs = [
-        "foo_library/foo_library.cc",
-    ],
-    hdrs = [
-        "foo_library/foo_library.h",
-    ],
-    deps = [
-        "//api",
-        "//sdk:headers",
-    ],
-)
-
 # TODO: enable bazel build
 # cc_binary(
 #     name = "example_jaeger",
 #     srcs = [
 #         "main.cc",
 #     ],
 #     deps = [
-#         ":foo_library",
+#         "//examples/common/foo_library:common_foo_library",
 #         "//api",
 #         "//exporters/jaeger:jaeger_exporter",
 #         "//sdk/src/trace",

diff --git a/examples/jaeger/CMakeLists.txt b/examples/jaeger/CMakeLists.txt
@@ -1,10 +1,6 @@
 include_directories(${CMAKE_SOURCE_DIR}/exporters/jaeger/include)
 
-add_library(jaeger_foo_library foo_library/foo_library.cc)
-target_link_libraries(jaeger_foo_library ${CMAKE_THREAD_LIBS_INIT}
-                      opentelemetry_api)
-
 add_executable(example_jaeger main.cc)
 target_link_libraries(
-  example_jaeger ${CMAKE_THREAD_LIBS_INIT} jaeger_foo_library
+  example_jaeger ${CMAKE_THREAD_LIBS_INIT} common_foo_library
   opentelemetry_trace opentelemetry_exporter_jaeger_trace)
diff --git a/examples/jaeger/main.cc b/examples/jaeger/main.cc
@@ -6,7 +6,11 @@
 #include "opentelemetry/sdk/trace/tracer_provider.h"
 #include "opentelemetry/trace/provider.h"
 
-#include "foo_library/foo_library.h"
+#ifdef BAZEL_BUILD
+#  include "examples/common/foo_library/foo_library.h"
+#else
+#  include "foo_library/foo_library.h"
+#endif
 
 namespace trace    = opentelemetry::trace;
 namespace nostd    = opentelemetry::nostd;

diff --git a/examples/multi_processor/BUILD b/examples/multi_processor/BUILD
@@ -1,24 +1,11 @@
-cc_library(
-    name = "foo_multi_library",
-    srcs = [
-        "foo_library/foo_library.cc",
-    ],
-    hdrs = [
-        "foo_library/foo_library.h",
-    ],
-    deps = [
-        "//api",
-    ],
-)
-
 cc_binary(
     name = "example_multi_processor",
     srcs = [
         "main.cc",
     ],
     deps = [
-        ":foo_multi_library",
         "//api",
+        "//examples/common/foo_library:common_foo_library",
         "//exporters/memory:in_memory_span_exporter",
         "//exporters/ostream:ostream_span_exporter",
         "//sdk/src/trace",

diff --git a/examples/multi_processor/CMakeLists.txt b/examples/multi_processor/CMakeLists.txt
@@ -1,10 +1,7 @@
 include_directories(${CMAKE_SOURCE_DIR}/exporters/ostream/include
                     ${CMAKE_SOURCE_DIR}/exporters/memory/include)
 
-add_library(foo_multi_library foo_library/foo_library.cc)
-target_link_libraries(foo_multi_library opentelemetry_exporter_ostream_span
-                      ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-
 add_executable(example_multi_processor main.cc)
-target_link_libraries(example_multi_processor ${CMAKE_THREAD_LIBS_INIT}
-                      foo_multi_library opentelemetry_trace)
+target_link_libraries(
+  example_multi_processor ${CMAKE_THREAD_LIBS_INIT} common_foo_library
+  opentelemetry_trace opentelemetry_exporter_ostream_span)
diff --git a/examples/multi_processor/foo_library/foo_library.cc b/examples/multi_processor/foo_library/foo_library.cc
diff --git a/examples/multi_processor/foo_library/foo_library.h b/examples/multi_processor/foo_library/foo_library.h
diff --git a/examples/multi_processor/main.cc b/examples/multi_processor/main.cc
@@ -7,7 +7,11 @@
 #include "opentelemetry/trace/provider.h"
 
 // Using an exporter that simply dumps span data to stdout.
-#include "foo_library/foo_library.h"
+#ifdef BAZEL_BUILD
+#  include "examples/common/foo_library/foo_library.h"
+#else
+#  include "foo_library/foo_library.h"
+#endif
 #include "opentelemetry/exporters/memory/in_memory_span_exporter.h"
 #include "opentelemetry/exporters/ostream/span_exporter.h"
 

diff --git a/examples/otlp/BUILD b/examples/otlp/BUILD
@@ -1,24 +1,11 @@
-cc_library(
-    name = "foo_library",
-    srcs = [
-        "foo_library/foo_library.cc",
-    ],
-    hdrs = [
-        "foo_library/foo_library.h",
-    ],
-    deps = [
-        "//api",
-    ],
-)
-
 cc_binary(
     name = "example_otlp_grpc",
     srcs = [
         "grpc_main.cc",
     ],
     deps = [
-        ":foo_library",
         "//api",
+        "//examples/common/foo_library:common_foo_library",
         "//exporters/otlp:otlp_grpc_exporter",
         "//sdk/src/trace",
     ],
@@ -30,8 +17,8 @@ cc_binary(
         "http_main.cc",
     ],
     deps = [
-        ":foo_library",
         "//api",
+        "//examples/common/foo_library:common_foo_library",
         "//exporters/otlp:otlp_http_exporter",
         "//sdk/src/trace",
     ],

diff --git a/examples/otlp/CMakeLists.txt b/examples/otlp/CMakeLists.txt
@@ -1,21 +1,17 @@
 include_directories(
-  ${CMAKE_BINARY_DIR}/generated/third_party/opentelemetry-proto)
-include_directories(${CMAKE_SOURCE_DIR}/exporters/otlp/include)
-
-add_library(otlp_foo_library foo_library/foo_library.cc)
-target_link_libraries(otlp_foo_library ${CMAKE_THREAD_LIBS_INIT}
-                      opentelemetry_api)
+  ${CMAKE_BINARY_DIR}/generated/third_party/opentelemetry-proto
+  ${CMAKE_SOURCE_DIR}/exporters/otlp/include)
 
 if(WITH_OTLP_GRPC)
   add_executable(example_otlp_grpc grpc_main.cc)
   target_link_libraries(
-    example_otlp_grpc ${CMAKE_THREAD_LIBS_INIT} otlp_foo_library
+    example_otlp_grpc ${CMAKE_THREAD_LIBS_INIT} common_foo_library
     opentelemetry_trace opentelemetry_exporter_otlp_grpc gRPC::grpc++)
 endif()
 
 if(WITH_OTLP_HTTP)
   add_executable(example_otlp_http http_main.cc)
   target_link_libraries(
-    example_otlp_http ${CMAKE_THREAD_LIBS_INIT} otlp_foo_library
+    example_otlp_http ${CMAKE_THREAD_LIBS_INIT} common_foo_library
     opentelemetry_trace opentelemetry_exporter_otlp_http)
 endif()
diff --git a/examples/otlp/foo_library/foo_library.cc b/examples/otlp/foo_library/foo_library.cc
diff --git a/examples/otlp/foo_library/foo_library.h b/examples/otlp/foo_library/foo_library.h
diff --git a/examples/otlp/grpc_main.cc b/examples/otlp/grpc_main.cc
@@ -9,7 +9,11 @@
 #include "opentelemetry/sdk/trace/tracer_provider.h"
 #include "opentelemetry/trace/provider.h"
 
-#include "foo_library/foo_library.h"
+#ifdef BAZEL_BUILD
+#  include "examples/common/foo_library/foo_library.h"
+#else
+#  include "foo_library/foo_library.h"
+#endif
 
 namespace trace    = opentelemetry::trace;
 namespace nostd    = opentelemetry::nostd;

diff --git a/examples/otlp/http_main.cc b/examples/otlp/http_main.cc
@@ -8,7 +8,11 @@
 
 #include <string>
 
-#include "foo_library/foo_library.h"
+#ifdef BAZEL_BUILD
+#  include "examples/common/foo_library/foo_library.h"
+#else
+#  include "foo_library/foo_library.h"
+#endif
 
 namespace trace    = opentelemetry::trace;
 namespace nostd    = opentelemetry::nostd;

diff --git a/examples/simple/BUILD b/examples/simple/BUILD
@@ -1,25 +1,11 @@
-cc_library(
-    name = "foo_library",
-    srcs = [
-        "foo_library/foo_library.cc",
-    ],
-    hdrs = [
-        "foo_library/foo_library.h",
-    ],
-    deps = [
-        "//api",
-    ],
-)
-
 cc_binary(
     name = "example_simple",
     srcs = [
         "main.cc",
     ],
     deps = [
-        ":foo_library",
         "//api",
+        "//examples/common/foo_library:common_foo_library",
         "//exporters/ostream:ostream_span_exporter",
-        "//sdk/src/trace",
     ],
 )
diff --git a/examples/simple/CMakeLists.txt b/examples/simple/CMakeLists.txt
@@ -1,9 +1,6 @@
 include_directories(${CMAKE_SOURCE_DIR}/exporters/ostream/include)
 
-add_library(foo_library foo_library/foo_library.cc)
-target_link_libraries(foo_library opentelemetry_exporter_ostream_span
-                      ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-
 add_executable(example_simple main.cc)
-target_link_libraries(example_simple ${CMAKE_THREAD_LIBS_INIT} foo_library
-                      opentelemetry_trace)
+target_link_libraries(
+  example_simple ${CMAKE_THREAD_LIBS_INIT} common_foo_library
+  opentelemetry_trace opentelemetry_exporter_ostream_span)