Skip to content

Commit d60cf43

Browse files
dbarkerdbarker
authored
[CONFIGURATION/BUILD] Fix ostream, prometheus, and detector builder library linking (#4551)
1 parent c1affcf commit d60cf43

6 files changed

Lines changed: 36 additions & 22 deletions

File tree

‎ci/do_ci.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -825,6 +825,9 @@ elif [[ "$1" == "bazel.noexcept" ]]; then
825825
-//sdk/src/configuration/...
826826
-//sdk/test/configuration/...
827827
-//resource_detectors/...
828+
-//exporters/ostream:ostream_log_record_exporter_builder
829+
-//exporters/ostream:ostream_metric_exporter_builder
830+
-//exporters/ostream:ostream_span_exporter_builder
828831
-//exporters/otlp:otlp_builder_utils
829832
-//exporters/otlp:otlp_grpc_span_exporter_builder
830833
-//exporters/otlp:otlp_grpc_log_record_exporter_builder

‎exporters/ostream/BUILD‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ cc_library(
3636
tags = ["ostream"],
3737
deps = [
3838
":ostream_log_record_exporter",
39+
"//sdk/src/configuration:configuration_core",
3940
],
4041
)
4142

@@ -88,6 +89,7 @@ cc_library(
8889
],
8990
deps = [
9091
":ostream_metric_exporter",
92+
"//sdk/src/configuration:configuration_core",
9193
],
9294
)
9395

@@ -134,6 +136,7 @@ cc_library(
134136
tags = ["ostream"],
135137
deps = [
136138
":ostream_span_exporter",
139+
"//sdk/src/configuration:configuration_core",
137140
],
138141
)
139142

‎exporters/ostream/CMakeLists.txt‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ set_target_version(opentelemetry_exporter_ostream_span)
1616

1717
target_include_directories(
1818
opentelemetry_exporter_ostream_span
19-
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>")
19+
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
20+
"$<INSTALL_INTERFACE:include>")
2021

2122
target_link_libraries(opentelemetry_exporter_ostream_span
2223
PUBLIC opentelemetry_trace)
@@ -51,8 +52,8 @@ target_include_directories(
5152

5253
target_link_libraries(
5354
opentelemetry_exporter_ostream_span_builder
54-
PUBLIC opentelemetry_exporter_ostream_span
55-
PRIVATE opentelemetry_configuration_core)
55+
PUBLIC opentelemetry_configuration_core opentelemetry_trace
56+
PRIVATE opentelemetry_exporter_ostream_span)
5657

5758
list(APPEND OPENTELEMETRY_OSTREAM_BUILDER_TARGETS
5859
opentelemetry_exporter_ostream_span_builder)
@@ -69,7 +70,9 @@ set_target_version(opentelemetry_exporter_ostream_metrics)
6970

7071
target_include_directories(
7172
opentelemetry_exporter_ostream_metrics
72-
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>")
73+
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
74+
"$<INSTALL_INTERFACE:include>")
75+
7376
target_link_libraries(opentelemetry_exporter_ostream_metrics
7477
PUBLIC opentelemetry_metrics)
7578

@@ -103,8 +106,8 @@ target_include_directories(
103106
"$<INSTALL_INTERFACE:include>")
104107
target_link_libraries(
105108
opentelemetry_exporter_ostream_metrics_builder
106-
PUBLIC opentelemetry_exporter_ostream_metrics
107-
PRIVATE opentelemetry_configuration_core)
109+
PUBLIC opentelemetry_configuration_core opentelemetry_metrics
110+
PRIVATE opentelemetry_exporter_ostream_metrics)
108111

109112
list(APPEND OPENTELEMETRY_OSTREAM_BUILDER_TARGETS
110113
opentelemetry_exporter_ostream_metrics_builder)
@@ -121,7 +124,8 @@ set_target_version(opentelemetry_exporter_ostream_logs)
121124

122125
target_include_directories(
123126
opentelemetry_exporter_ostream_logs
124-
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>")
127+
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
128+
"$<INSTALL_INTERFACE:include>")
125129
target_link_libraries(opentelemetry_exporter_ostream_logs
126130
PUBLIC opentelemetry_logs)
127131
list(APPEND OPENTELEMETRY_OSTREAM_TARGETS opentelemetry_exporter_ostream_logs)
@@ -153,8 +157,8 @@ target_include_directories(
153157
"$<INSTALL_INTERFACE:include>")
154158
target_link_libraries(
155159
opentelemetry_exporter_ostream_logs_builder
156-
PUBLIC opentelemetry_exporter_ostream_logs
157-
PRIVATE opentelemetry_configuration_core)
160+
PUBLIC opentelemetry_configuration_core opentelemetry_logs
161+
PRIVATE opentelemetry_exporter_ostream_logs)
158162
list(APPEND OPENTELEMETRY_OSTREAM_BUILDER_TARGETS
159163
opentelemetry_exporter_ostream_logs_builder)
160164

@@ -182,7 +186,8 @@ if(OTELCPP_INSTALL)
182186
opentelemetry_add_pkgconfig(
183187
exporter_ostream_span_builder
184188
"OpenTelemetry Exporter - OStream Span Builder"
185-
"Builder for OStream span exporter." "opentelemetry_exporter_ostream_span")
189+
"Builder for OStream span exporter."
190+
"opentelemetry_exporter_ostream_span opentelemetry_configuration_core")
186191

187192
opentelemetry_add_pkgconfig(
188193
exporter_ostream_metrics "OpenTelemetry Exporter - OStream Metrics"
@@ -192,7 +197,7 @@ if(OTELCPP_INSTALL)
192197
exporter_ostream_metrics_builder
193198
"OpenTelemetry Exporter - OStream Metrics Builder"
194199
"Builder for OStream metrics exporter."
195-
"opentelemetry_exporter_ostream_metrics")
200+
"opentelemetry_exporter_ostream_metrics opentelemetry_configuration_core")
196201

197202
opentelemetry_add_pkgconfig(
198203
exporter_ostream_logs "OpenTelemetry Exporter - OStream Logs"
@@ -202,5 +207,5 @@ if(OTELCPP_INSTALL)
202207
exporter_ostream_logs_builder
203208
"OpenTelemetry Exporter - OStream Logs Builder"
204209
"Builder for OStream log record exporter."
205-
"opentelemetry_exporter_ostream_logs")
210+
"opentelemetry_exporter_ostream_logs opentelemetry_configuration_core")
206211
endif()

‎exporters/prometheus/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ cc_library(
4242
tags = ["prometheus"],
4343
deps = [
4444
":prometheus_exporter",
45+
"//sdk/src/configuration:configuration_core",
4546
],
4647
)
4748

‎exporters/prometheus/CMakeLists.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ target_include_directories(
4444

4545
target_link_libraries(
4646
opentelemetry_exporter_prometheus_builder
47-
PUBLIC opentelemetry_exporter_prometheus
48-
PRIVATE opentelemetry_configuration_core)
47+
PUBLIC opentelemetry_configuration_core opentelemetry_metrics
48+
PRIVATE opentelemetry_exporter_prometheus)
4949

5050
otel_add_component(
5151
COMPONENT
@@ -70,7 +70,8 @@ if(OTELCPP_INSTALL)
7070

7171
opentelemetry_add_pkgconfig(
7272
exporter_prometheus_builder "OpenTelemetry Exporter - Prometheus Builder"
73-
"Builder for Prometheus exporter." "opentelemetry_exporter_prometheus")
73+
"Builder for Prometheus exporter."
74+
"opentelemetry_exporter_prometheus opentelemetry_configuration_core")
7475
endif()
7576

7677
if(OTELCPP_BUILD_TESTING)

‎resource_detectors/CMakeLists.txt‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ target_include_directories(
3838

3939
target_link_libraries(
4040
opentelemetry_container_resource_detector_builder
41-
PRIVATE opentelemetry_container_resource_detector
42-
opentelemetry_configuration_core)
41+
PUBLIC opentelemetry_resources opentelemetry_configuration_core
42+
PRIVATE opentelemetry_container_resource_detector)
4343

4444
#
4545
# opentelemetry_env_entity_resource_detector
@@ -95,7 +95,8 @@ target_include_directories(
9595

9696
target_link_libraries(
9797
opentelemetry_host_resource_detector_builder
98-
PRIVATE opentelemetry_host_resource_detector opentelemetry_configuration_core)
98+
PUBLIC opentelemetry_resources opentelemetry_configuration_core
99+
PRIVATE opentelemetry_host_resource_detector)
99100

100101
#
101102
# opentelemetry_process_resource_detector
@@ -133,8 +134,8 @@ target_include_directories(
133134

134135
target_link_libraries(
135136
opentelemetry_process_resource_detector_builder
136-
PRIVATE opentelemetry_process_resource_detector
137-
opentelemetry_configuration_core)
137+
PUBLIC opentelemetry_resources opentelemetry_configuration_core
138+
PRIVATE opentelemetry_process_resource_detector)
138139

139140
#
140141
# opentelemetry_service_resource_detector_utils
@@ -191,8 +192,8 @@ target_include_directories(
191192

192193
target_link_libraries(
193194
opentelemetry_service_resource_detector_builder
194-
PRIVATE opentelemetry_service_resource_detector
195-
opentelemetry_configuration_core)
195+
PUBLIC opentelemetry_resources opentelemetry_configuration_core
196+
PRIVATE opentelemetry_service_resource_detector)
196197

197198
#
198199
# opentelemetry_resource_detectors (interface to all detectors)

0 commit comments

Comments
 (0)