Skip to content

Commit 3f1e66b

Browse files
marcalffmarcalff
committed
Rework exporters CMake
1 parent 93b9b21 commit 3f1e66b

File tree

10 files changed

+525
-127
lines changed

10 files changed

+525
-127
lines changed

‎examples/yaml/CMakeLists.txt‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,38 +30,51 @@ target_link_libraries(
3030
${CMAKE_THREAD_LIBS_INIT}
3131
common_metrics_foo_library
3232
common_logs_foo_library
33-
opentelemetry_exporter_ostream_span
34-
opentelemetry_exporter_ostream_metrics
35-
opentelemetry_exporter_ostream_logs)
33+
opentelemetry_exporter_ostream_span_builder
34+
opentelemetry_exporter_ostream_metrics_builder
35+
opentelemetry_exporter_ostream_logs_builder)
3636

3737
if(WITH_OTLP_HTTP)
3838
include_directories(${CMAKE_SOURCE_DIR}/exporters/otlp/include)
3939
add_definitions(-DOTEL_HAVE_OTLP_HTTP)
40-
target_link_libraries(example_yaml opentelemetry_otlp_http_builder)
40+
target_link_libraries(example_yaml opentelemetry_exporter_otlp_http_builder)
41+
target_link_libraries(example_yaml
42+
opentelemetry_exporter_otlp_http_log_builder)
43+
target_link_libraries(example_yaml
44+
opentelemetry_exporter_otlp_http_metric_builder)
4145
endif()
4246

4347
if(WITH_OTLP_GRPC)
4448
include_directories(${CMAKE_SOURCE_DIR}/exporters/otlp/include)
4549
add_definitions(-DOTEL_HAVE_OTLP_GRPC)
46-
target_link_libraries(example_yaml opentelemetry_otlp_grpc_builder)
50+
target_link_libraries(example_yaml opentelemetry_exporter_otlp_grpc_builder)
51+
target_link_libraries(example_yaml
52+
opentelemetry_exporter_otlp_grpc_log_builder)
53+
target_link_libraries(example_yaml
54+
opentelemetry_exporter_otlp_grpc_metrics_builder)
4755
endif()
4856

4957
if(WITH_OTLP_FILE)
5058
include_directories(${CMAKE_SOURCE_DIR}/exporters/otlp/include)
5159
add_definitions(-DOTEL_HAVE_OTLP_FILE)
52-
target_link_libraries(example_yaml opentelemetry_otlp_file_builder)
60+
target_link_libraries(example_yaml opentelemetry_exporter_otlp_file_builder)
61+
target_link_libraries(example_yaml
62+
opentelemetry_exporter_otlp_file_log_builder)
63+
target_link_libraries(example_yaml
64+
opentelemetry_exporter_otlp_file_metric_builder)
5365
endif()
5466

5567
if(WITH_ZIPKIN)
5668
include_directories(${CMAKE_SOURCE_DIR}/exporters/zipkin/include)
5769
add_definitions(-DOTEL_HAVE_ZIPKIN)
58-
target_link_libraries(example_yaml opentelemetry_exporter_zipkin_trace)
70+
target_link_libraries(example_yaml
71+
opentelemetry_exporter_zipkin_trace_builder)
5972
endif()
6073

6174
if(WITH_PROMETHEUS)
6275
include_directories(${CMAKE_SOURCE_DIR}/exporters/prometheus/include)
6376
add_definitions(-DOTEL_HAVE_PROMETHEUS)
64-
target_link_libraries(example_yaml opentelemetry_exporter_prometheus)
77+
target_link_libraries(example_yaml opentelemetry_exporter_prometheus_builder)
6578
endif()
6679

6780
if(DEFINED OPENTELEMETRY_BUILD_DLL)

‎exporters/ostream/BUILD‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@ package(default_visibility = ["//visibility:public"])
66
cc_library(
77
name = "ostream_log_record_exporter",
88
srcs = [
9-
"src/console_log_record_builder.cc",
109
"src/log_record_exporter.cc",
1110
"src/log_record_exporter_factory.cc",
1211
],
1312
hdrs = [
1413
"include/opentelemetry/exporters/ostream/common_utils.h",
15-
"include/opentelemetry/exporters/ostream/console_log_record_builder.h",
1614
"include/opentelemetry/exporters/ostream/log_record_exporter.h",
1715
"include/opentelemetry/exporters/ostream/log_record_exporter_factory.h",
1816
],
@@ -39,13 +37,11 @@ cc_test(
3937
cc_library(
4038
name = "ostream_metric_exporter",
4139
srcs = [
42-
"src/console_push_metric_builder.cc",
4340
"src/metric_exporter.cc",
4441
"src/metric_exporter_factory.cc",
4542
],
4643
hdrs = [
4744
"include/opentelemetry/exporters/ostream/common_utils.h",
48-
"include/opentelemetry/exporters/ostream/console_push_metric_builder.h",
4945
"include/opentelemetry/exporters/ostream/metric_exporter.h",
5046
"include/opentelemetry/exporters/ostream/metric_exporter_factory.h",
5147
],
@@ -75,13 +71,11 @@ cc_test(
7571
cc_library(
7672
name = "ostream_span_exporter",
7773
srcs = [
78-
"src/console_span_builder.cc",
7974
"src/span_exporter.cc",
8075
"src/span_exporter_factory.cc",
8176
],
8277
hdrs = [
8378
"include/opentelemetry/exporters/ostream/common_utils.h",
84-
"include/opentelemetry/exporters/ostream/console_span_builder.h",
8579
"include/opentelemetry/exporters/ostream/span_exporter.h",
8680
"include/opentelemetry/exporters/ostream/span_exporter_factory.h",
8781
],

‎exporters/ostream/CMakeLists.txt‎

Lines changed: 113 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
add_library(
5-
opentelemetry_exporter_ostream_span
6-
src/span_exporter.cc src/span_exporter_factory.cc src/console_span_builder.cc)
4+
#
5+
# opentelemetry_exporter_ostream_span
6+
#
7+
8+
add_library(opentelemetry_exporter_ostream_span src/span_exporter.cc
9+
src/span_exporter_factory.cc)
710

811
set_target_properties(opentelemetry_exporter_ostream_span
912
PROPERTIES EXPORT_NAME ostream_span_exporter)
@@ -28,10 +31,33 @@ if(BUILD_TESTING)
2831
TEST_LIST ostream_span_test)
2932
endif() # BUILD_TESTING
3033

31-
add_library(
32-
opentelemetry_exporter_ostream_metrics
33-
src/metric_exporter.cc src/metric_exporter_factory.cc
34-
src/console_push_metric_builder.cc)
34+
#
35+
# opentelemetry_exporter_ostream_span_builder
36+
#
37+
38+
add_library(opentelemetry_exporter_ostream_span_builder
39+
src/console_span_builder.cc)
40+
41+
set_target_properties(opentelemetry_exporter_ostream_span_builder
42+
PROPERTIES EXPORT_NAME ostream_span_exporter_builder)
43+
set_target_version(opentelemetry_exporter_ostream_span_builder)
44+
45+
target_include_directories(
46+
opentelemetry_exporter_ostream_span_builder
47+
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>")
48+
49+
target_link_libraries(opentelemetry_exporter_ostream_span_builder
50+
PUBLIC opentelemetry_exporter_ostream_span)
51+
52+
list(APPEND OPENTELEMETRY_OSTREAM_BUILDER_TARGETS
53+
opentelemetry_exporter_ostream_span_builder)
54+
55+
#
56+
# opentelemetry_exporter_ostream_metrics
57+
#
58+
59+
add_library(opentelemetry_exporter_ostream_metrics
60+
src/metric_exporter.cc src/metric_exporter_factory.cc)
3561
set_target_properties(opentelemetry_exporter_ostream_metrics
3662
PROPERTIES EXPORT_NAME ostream_metrics_exporter)
3763
set_target_version(opentelemetry_exporter_ostream_metrics)
@@ -56,10 +82,31 @@ if(BUILD_TESTING)
5682
TEST_LIST ostream_metric_test)
5783
endif()
5884

59-
add_library(
60-
opentelemetry_exporter_ostream_logs
61-
src/log_record_exporter.cc src/log_record_exporter_factory.cc
62-
src/console_log_record_builder.cc)
85+
#
86+
# opentelemetry_exporter_ostream_metrics_builder
87+
#
88+
89+
add_library(opentelemetry_exporter_ostream_metrics_builder
90+
src/console_push_metric_builder.cc)
91+
set_target_properties(opentelemetry_exporter_ostream_metrics_builder
92+
PROPERTIES EXPORT_NAME ostream_metrics_exporter_builder)
93+
set_target_version(opentelemetry_exporter_ostream_metrics_builder)
94+
95+
target_include_directories(
96+
opentelemetry_exporter_ostream_metrics_builder
97+
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>")
98+
target_link_libraries(opentelemetry_exporter_ostream_metrics_builder
99+
PUBLIC opentelemetry_exporter_ostream_metrics)
100+
101+
list(APPEND OPENTELEMETRY_OSTREAM_BUILDER_TARGETS
102+
opentelemetry_exporter_ostream_metrics_builder)
103+
104+
#
105+
# opentelemetry_exporter_ostream_logs
106+
#
107+
108+
add_library(opentelemetry_exporter_ostream_logs
109+
src/log_record_exporter.cc src/log_record_exporter_factory.cc)
63110
set_target_properties(opentelemetry_exporter_ostream_logs
64111
PROPERTIES EXPORT_NAME ostream_log_record_exporter)
65112
set_target_version(opentelemetry_exporter_ostream_logs)
@@ -71,6 +118,35 @@ target_link_libraries(opentelemetry_exporter_ostream_logs
71118
PUBLIC opentelemetry_logs)
72119
list(APPEND OPENTELEMETRY_OSTREAM_TARGETS opentelemetry_exporter_ostream_logs)
73120

121+
if(BUILD_TESTING)
122+
add_executable(ostream_log_test test/ostream_log_test.cc)
123+
target_link_libraries(ostream_log_test ${GTEST_BOTH_LIBRARIES}
124+
opentelemetry_exporter_ostream_logs)
125+
gtest_add_tests(
126+
TARGET ostream_log_test
127+
TEST_PREFIX exporter.
128+
TEST_LIST ostream_log_test)
129+
endif()
130+
131+
#
132+
# opentelemetry_exporter_ostream_logs_builder
133+
#
134+
135+
add_library(opentelemetry_exporter_ostream_logs_builder
136+
src/console_log_record_builder.cc)
137+
set_target_properties(
138+
opentelemetry_exporter_ostream_logs_builder
139+
PROPERTIES EXPORT_NAME ostream_log_record_exporter_builder)
140+
set_target_version(opentelemetry_exporter_ostream_logs_builder)
141+
142+
target_include_directories(
143+
opentelemetry_exporter_ostream_logs_builder
144+
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>")
145+
target_link_libraries(opentelemetry_exporter_ostream_logs_builder
146+
PUBLIC opentelemetry_exporter_ostream_logs)
147+
list(APPEND OPENTELEMETRY_OSTREAM_BUILDER_TARGETS
148+
opentelemetry_exporter_ostream_logs_builder)
149+
74150
otel_add_component(
75151
COMPONENT
76152
exporters_ostream
@@ -82,14 +158,30 @@ otel_add_component(
82158
"include/opentelemetry/exporters"
83159
FILES_MATCHING
84160
PATTERN
85-
"*.h")
161+
"*.h"
162+
PATTERN
163+
"console_log_record_builder.h"
164+
EXCLUDE
165+
PATTERN
166+
"console_push_metric_builder.h"
167+
EXCLUDE
168+
PATTERN
169+
"console_span_builder.h"
170+
EXCLUDE)
86171

87-
if(BUILD_TESTING)
88-
add_executable(ostream_log_test test/ostream_log_test.cc)
89-
target_link_libraries(ostream_log_test ${GTEST_BOTH_LIBRARIES}
90-
opentelemetry_exporter_ostream_logs)
91-
gtest_add_tests(
92-
TARGET ostream_log_test
93-
TEST_PREFIX exporter.
94-
TEST_LIST ostream_log_test)
95-
endif()
172+
otel_add_component(
173+
COMPONENT
174+
exporters_ostream_builder
175+
TARGETS
176+
${OPENTELEMETRY_OSTREAM_BUILDER_TARGETS}
177+
FILES_DIRECTORY
178+
"include/opentelemetry/exporters/ostream"
179+
FILES_DESTINATION
180+
"include/opentelemetry/exporters"
181+
FILES_MATCHING
182+
PATTERN
183+
"console_log_record_builder.h"
184+
PATTERN
185+
"console_push_metric_builder.h"
186+
PATTERN
187+
"console_span_builder.h")

‎exporters/otlp/BUILD‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,13 @@ cc_library(
9393
"src/otlp_grpc_exporter.cc",
9494
"src/otlp_grpc_exporter_factory.cc",
9595
"src/otlp_grpc_exporter_options.cc",
96-
"src/otlp_grpc_span_builder.cc",
9796
],
9897
hdrs = [
9998
"include/opentelemetry/exporters/otlp/otlp_environment.h",
10099
"include/opentelemetry/exporters/otlp/otlp_grpc_client_options.h",
101100
"include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h",
102101
"include/opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h",
103102
"include/opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h",
104-
"include/opentelemetry/exporters/otlp/otlp_grpc_span_builder.h",
105103
"include/opentelemetry/exporters/otlp/otlp_grpc_utils.h",
106104
"include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
107105
"include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
@@ -168,15 +166,13 @@ cc_library(
168166
"src/otlp_http_exporter.cc",
169167
"src/otlp_http_exporter_factory.cc",
170168
"src/otlp_http_exporter_options.cc",
171-
"src/otlp_http_span_builder.cc",
172169
],
173170
hdrs = [
174171
"include/opentelemetry/exporters/otlp/otlp_environment.h",
175172
"include/opentelemetry/exporters/otlp/otlp_http_exporter.h",
176173
"include/opentelemetry/exporters/otlp/otlp_http_exporter_factory.h",
177174
"include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h",
178175
"include/opentelemetry/exporters/otlp/otlp_http_exporter_runtime_options.h",
179-
"include/opentelemetry/exporters/otlp/otlp_http_span_builder.h",
180176
"include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
181177
"include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
182178
],
@@ -256,15 +252,13 @@ cc_library(
256252
"src/otlp_grpc_metric_exporter.cc",
257253
"src/otlp_grpc_metric_exporter_factory.cc",
258254
"src/otlp_grpc_metric_exporter_options.cc",
259-
"src/otlp_grpc_push_metric_builder.cc",
260255
],
261256
hdrs = [
262257
"include/opentelemetry/exporters/otlp/otlp_environment.h",
263258
"include/opentelemetry/exporters/otlp/otlp_grpc_client_options.h",
264259
"include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h",
265260
"include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h",
266261
"include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h",
267-
"include/opentelemetry/exporters/otlp/otlp_grpc_push_metric_builder.h",
268262
"include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
269263
"include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
270264
],
@@ -290,15 +284,13 @@ cc_library(
290284
"src/otlp_http_metric_exporter.cc",
291285
"src/otlp_http_metric_exporter_factory.cc",
292286
"src/otlp_http_metric_exporter_options.cc",
293-
"src/otlp_http_push_metric_builder.cc",
294287
],
295288
hdrs = [
296289
"include/opentelemetry/exporters/otlp/otlp_environment.h",
297290
"include/opentelemetry/exporters/otlp/otlp_http_metric_exporter.h",
298291
"include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h",
299292
"include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h",
300293
"include/opentelemetry/exporters/otlp/otlp_http_metric_exporter_runtime_options.h",
301-
"include/opentelemetry/exporters/otlp/otlp_http_push_metric_builder.h",
302294
"include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
303295
"include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
304296
],
@@ -347,14 +339,12 @@ cc_library(
347339
cc_library(
348340
name = "otlp_http_log_record_exporter",
349341
srcs = [
350-
"src/otlp_http_log_record_builder.cc",
351342
"src/otlp_http_log_record_exporter.cc",
352343
"src/otlp_http_log_record_exporter_factory.cc",
353344
"src/otlp_http_log_record_exporter_options.cc",
354345
],
355346
hdrs = [
356347
"include/opentelemetry/exporters/otlp/otlp_environment.h",
357-
"include/opentelemetry/exporters/otlp/otlp_http_log_record_builder.h",
358348
"include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h",
359349
"include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h",
360350
"include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h",
@@ -407,15 +397,13 @@ cc_library(
407397
cc_library(
408398
name = "otlp_grpc_log_record_exporter",
409399
srcs = [
410-
"src/otlp_grpc_log_record_builder.cc",
411400
"src/otlp_grpc_log_record_exporter.cc",
412401
"src/otlp_grpc_log_record_exporter_factory.cc",
413402
"src/otlp_grpc_log_record_exporter_options.cc",
414403
],
415404
hdrs = [
416405
"include/opentelemetry/exporters/otlp/otlp_environment.h",
417406
"include/opentelemetry/exporters/otlp/otlp_grpc_client_options.h",
418-
"include/opentelemetry/exporters/otlp/otlp_grpc_log_record_builder.h",
419407
"include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h",
420408
"include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h",
421409
"include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h",

0 commit comments

Comments
 (0)