Skip to content

Commit d92df5b

Browse files
malkiamalkia
committed
dll fixes for the new configuration sdk
1 parent a1c25f1 commit d92df5b

File tree

7 files changed

+58
-9
lines changed

7 files changed

+58
-9
lines changed

‎.bazelignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,3 @@ WORKSPACE
1414
otel_sdk_build.cmd
1515
.git
1616
x
17-
sdk/src/configuration
18-
sdk/test/configuration

‎.bazelrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,9 @@ mod --lockfile_mode=refresh
232232
# Select clang-cl to be the default compiler on Windows
233233
build:windows --config=clang-cl
234234

235+
# rapidyml uses c4core, and it seems to misdetects "MSVC" from clang-cl standpoint
236+
build:clang-cl --copt=-DC4_MSVC --host_copt=-DC4_MSVC
237+
235238
# See MODULE.bazel where we've disabled the platform/toolchain setup, but made it back here
236239
build:clang-cl --host_copt=-Wno-dynamic-class-memaccess --copt=-Wno-dynamic-class-memaccess
237240
build:clang-cl --host_copt=-Wno-microsoft-cast --copt=-Wno-microsoft-cast

‎BUILD‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,38 @@ otel_cc_library(
7777
"@otel_sdk//exporters/memory:in_memory_metric_data",
7878
"@otel_sdk//exporters/memory:in_memory_metric_exporter_factory",
7979
"@otel_sdk//exporters/memory:in_memory_span_exporter",
80+
"@otel_sdk//exporters/ostream:ostream_log_record_exporter_builder",
8081
"@otel_sdk//exporters/ostream:ostream_log_record_exporter",
82+
"@otel_sdk//exporters/ostream:ostream_metric_exporter_builder",
8183
"@otel_sdk//exporters/ostream:ostream_metric_exporter",
84+
"@otel_sdk//exporters/ostream:ostream_span_exporter_builder",
8285
"@otel_sdk//exporters/ostream:ostream_span_exporter",
8386
"@otel_sdk//exporters/otlp:otlp_file_exporter",
87+
"@otel_sdk//exporters/otlp:otlp_file_log_record_exporter_builder",
8488
"@otel_sdk//exporters/otlp:otlp_file_log_record_exporter",
89+
"@otel_sdk//exporters/otlp:otlp_file_metric_exporter_builder",
8590
"@otel_sdk//exporters/otlp:otlp_file_metric_exporter",
91+
"@otel_sdk//exporters/otlp:otlp_file_span_exporter_builder",
8692
"@otel_sdk//exporters/otlp:otlp_grpc_exporter",
8793
"@otel_sdk//exporters/otlp:otlp_grpc_forward_proxy",
94+
"@otel_sdk//exporters/otlp:otlp_grpc_log_record_exporter_builder",
8895
"@otel_sdk//exporters/otlp:otlp_grpc_log_record_exporter",
96+
"@otel_sdk//exporters/otlp:otlp_grpc_metric_exporter_builder",
8997
"@otel_sdk//exporters/otlp:otlp_grpc_metric_exporter",
98+
"@otel_sdk//exporters/otlp:otlp_grpc_span_exporter_builder",
9099
"@otel_sdk//exporters/otlp:otlp_http_exporter",
100+
"@otel_sdk//exporters/otlp:otlp_http_log_record_exporter_builder",
91101
"@otel_sdk//exporters/otlp:otlp_http_log_record_exporter",
102+
"@otel_sdk//exporters/otlp:otlp_http_metric_exporter_builder",
92103
"@otel_sdk//exporters/otlp:otlp_http_metric_exporter",
104+
"@otel_sdk//exporters/otlp:otlp_http_span_exporter_builder",
105+
"@otel_sdk//exporters/prometheus:prometheus_exporter_builder",
93106
"@otel_sdk//exporters/prometheus:prometheus_exporter",
94107
"@otel_sdk//exporters/prometheus:prometheus_push_exporter",
108+
"@otel_sdk//exporters/zipkin:zipkin_exporter_builder",
95109
"@otel_sdk//exporters/zipkin:zipkin_exporter",
96110
"@otel_sdk//resource_detectors",
111+
"@otel_sdk//sdk/src/configuration",
97112
] + select({
98113
# "@platforms//os:windows": ["@otel_sdk//exporters/etw:etw_exporter"],
99114
"//conditions:default": [],

‎dll_deps_generated_non_windows.bzl‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,42 @@ DLL_DEPS = {
1010
Label("@otel_sdk//exporters/memory:in_memory_span_data"): None,
1111
Label("@otel_sdk//exporters/memory:in_memory_span_exporter"): None,
1212
Label("@otel_sdk//exporters/ostream:ostream_log_record_exporter"): None,
13+
Label("@otel_sdk//exporters/ostream:ostream_log_record_exporter_builder"): None,
1314
Label("@otel_sdk//exporters/ostream:ostream_metric_exporter"): None,
15+
Label("@otel_sdk//exporters/ostream:ostream_metric_exporter_builder"): None,
1416
Label("@otel_sdk//exporters/ostream:ostream_span_exporter"): None,
17+
Label("@otel_sdk//exporters/ostream:ostream_span_exporter_builder"): None,
18+
Label("@otel_sdk//exporters/otlp:otlp_builder_utils"): None,
1519
Label("@otel_sdk//exporters/otlp:otlp_file_client"): None,
1620
Label("@otel_sdk//exporters/otlp:otlp_file_exporter"): None,
1721
Label("@otel_sdk//exporters/otlp:otlp_file_log_record_exporter"): None,
22+
Label("@otel_sdk//exporters/otlp:otlp_file_log_record_exporter_builder"): None,
1823
Label("@otel_sdk//exporters/otlp:otlp_file_metric_exporter"): None,
24+
Label("@otel_sdk//exporters/otlp:otlp_file_metric_exporter_builder"): None,
25+
Label("@otel_sdk//exporters/otlp:otlp_file_span_exporter_builder"): None,
1926
Label("@otel_sdk//exporters/otlp:otlp_grpc_client"): None,
2027
Label("@otel_sdk//exporters/otlp:otlp_grpc_exporter"): None,
2128
Label("@otel_sdk//exporters/otlp:otlp_grpc_forward_proxy"): None,
2229
Label("@otel_sdk//exporters/otlp:otlp_grpc_log_record_exporter"): None,
30+
Label("@otel_sdk//exporters/otlp:otlp_grpc_log_record_exporter_builder"): None,
2331
Label("@otel_sdk//exporters/otlp:otlp_grpc_metric_exporter"): None,
32+
Label("@otel_sdk//exporters/otlp:otlp_grpc_metric_exporter_builder"): None,
33+
Label("@otel_sdk//exporters/otlp:otlp_grpc_span_exporter_builder"): None,
2434
Label("@otel_sdk//exporters/otlp:otlp_http_client"): None,
2535
Label("@otel_sdk//exporters/otlp:otlp_http_exporter"): None,
2636
Label("@otel_sdk//exporters/otlp:otlp_http_log_record_exporter"): None,
37+
Label("@otel_sdk//exporters/otlp:otlp_http_log_record_exporter_builder"): None,
2738
Label("@otel_sdk//exporters/otlp:otlp_http_metric_exporter"): None,
39+
Label("@otel_sdk//exporters/otlp:otlp_http_metric_exporter_builder"): None,
40+
Label("@otel_sdk//exporters/otlp:otlp_http_span_exporter_builder"): None,
2841
Label("@otel_sdk//exporters/otlp:otlp_recordable"): None,
2942
Label("@otel_sdk//exporters/prometheus:prometheus_collector"): None,
3043
Label("@otel_sdk//exporters/prometheus:prometheus_exporter"): None,
44+
Label("@otel_sdk//exporters/prometheus:prometheus_exporter_builder"): None,
3145
Label("@otel_sdk//exporters/prometheus:prometheus_exporter_utils"): None,
3246
Label("@otel_sdk//exporters/prometheus:prometheus_push_exporter"): None,
3347
Label("@otel_sdk//exporters/zipkin:zipkin_exporter"): None,
48+
Label("@otel_sdk//exporters/zipkin:zipkin_exporter_builder"): None,
3449
Label("@otel_sdk//exporters/zipkin:zipkin_recordable"): None,
3550
Label("@otel_sdk//ext:headers"): None,
3651
Label("@otel_sdk//ext/src/http/client/curl:http_client_curl"): None,
@@ -41,6 +56,7 @@ DLL_DEPS = {
4156
Label("@otel_sdk//sdk/src/common:disabled"): None,
4257
Label("@otel_sdk//sdk/src/common:env_variables"): None,
4358
Label("@otel_sdk//sdk/src/common:global_log_handler"): None,
59+
Label("@otel_sdk//sdk/src/configuration:configuration"): None,
4460
Label("@otel_sdk//sdk/src/logs:logs"): None,
4561
Label("@otel_sdk//sdk/src/metrics:metrics"): None,
4662
Label("@otel_sdk//sdk/src/resource:resource"): None,

‎dll_deps_generated_windows.bzl‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,42 @@ DLL_DEPS = {
1010
Label("@otel_sdk//exporters/memory:in_memory_span_data"): None,
1111
Label("@otel_sdk//exporters/memory:in_memory_span_exporter"): None,
1212
Label("@otel_sdk//exporters/ostream:ostream_log_record_exporter"): None,
13+
Label("@otel_sdk//exporters/ostream:ostream_log_record_exporter_builder"): None,
1314
Label("@otel_sdk//exporters/ostream:ostream_metric_exporter"): None,
15+
Label("@otel_sdk//exporters/ostream:ostream_metric_exporter_builder"): None,
1416
Label("@otel_sdk//exporters/ostream:ostream_span_exporter"): None,
17+
Label("@otel_sdk//exporters/ostream:ostream_span_exporter_builder"): None,
18+
Label("@otel_sdk//exporters/otlp:otlp_builder_utils"): None,
1519
Label("@otel_sdk//exporters/otlp:otlp_file_client"): None,
1620
Label("@otel_sdk//exporters/otlp:otlp_file_exporter"): None,
1721
Label("@otel_sdk//exporters/otlp:otlp_file_log_record_exporter"): None,
22+
Label("@otel_sdk//exporters/otlp:otlp_file_log_record_exporter_builder"): None,
1823
Label("@otel_sdk//exporters/otlp:otlp_file_metric_exporter"): None,
24+
Label("@otel_sdk//exporters/otlp:otlp_file_metric_exporter_builder"): None,
25+
Label("@otel_sdk//exporters/otlp:otlp_file_span_exporter_builder"): None,
1926
Label("@otel_sdk//exporters/otlp:otlp_grpc_client"): None,
2027
Label("@otel_sdk//exporters/otlp:otlp_grpc_exporter"): None,
2128
Label("@otel_sdk//exporters/otlp:otlp_grpc_forward_proxy"): None,
2229
Label("@otel_sdk//exporters/otlp:otlp_grpc_log_record_exporter"): None,
30+
Label("@otel_sdk//exporters/otlp:otlp_grpc_log_record_exporter_builder"): None,
2331
Label("@otel_sdk//exporters/otlp:otlp_grpc_metric_exporter"): None,
32+
Label("@otel_sdk//exporters/otlp:otlp_grpc_metric_exporter_builder"): None,
33+
Label("@otel_sdk//exporters/otlp:otlp_grpc_span_exporter_builder"): None,
2434
Label("@otel_sdk//exporters/otlp:otlp_http_client"): None,
2535
Label("@otel_sdk//exporters/otlp:otlp_http_exporter"): None,
2636
Label("@otel_sdk//exporters/otlp:otlp_http_log_record_exporter"): None,
37+
Label("@otel_sdk//exporters/otlp:otlp_http_log_record_exporter_builder"): None,
2738
Label("@otel_sdk//exporters/otlp:otlp_http_metric_exporter"): None,
39+
Label("@otel_sdk//exporters/otlp:otlp_http_metric_exporter_builder"): None,
40+
Label("@otel_sdk//exporters/otlp:otlp_http_span_exporter_builder"): None,
2841
Label("@otel_sdk//exporters/otlp:otlp_recordable"): None,
2942
Label("@otel_sdk//exporters/prometheus:prometheus_collector"): None,
3043
Label("@otel_sdk//exporters/prometheus:prometheus_exporter"): None,
44+
Label("@otel_sdk//exporters/prometheus:prometheus_exporter_builder"): None,
3145
Label("@otel_sdk//exporters/prometheus:prometheus_exporter_utils"): None,
3246
Label("@otel_sdk//exporters/prometheus:prometheus_push_exporter"): None,
3347
Label("@otel_sdk//exporters/zipkin:zipkin_exporter"): None,
48+
Label("@otel_sdk//exporters/zipkin:zipkin_exporter_builder"): None,
3449
Label("@otel_sdk//exporters/zipkin:zipkin_recordable"): None,
3550
Label("@otel_sdk//ext:headers"): None,
3651
Label("@otel_sdk//ext/src/http/client/curl:http_client_curl"): None,
@@ -41,6 +56,7 @@ DLL_DEPS = {
4156
Label("@otel_sdk//sdk/src/common:disabled"): None,
4257
Label("@otel_sdk//sdk/src/common:env_variables"): None,
4358
Label("@otel_sdk//sdk/src/common:global_log_handler"): None,
59+
Label("@otel_sdk//sdk/src/configuration:configuration"): None,
4460
Label("@otel_sdk//sdk/src/logs:logs"): None,
4561
Label("@otel_sdk//sdk/src/metrics:metrics"): None,
4662
Label("@otel_sdk//sdk/src/resource:resource"): None,

‎examples/configuration/BUILD‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4+
load("//:dll_deps.bzl", "dll_deps")
45
load("//bazel:otel_cc.bzl", "otel_cc_binary")
56

67
otel_cc_binary(
@@ -40,6 +41,6 @@ otel_cc_binary(
4041
"//sdk/src/logs",
4142
"//sdk/src/metrics",
4243
"//sdk/src/trace",
43-
"@com_google_googletest//:gtest_main",
44+
"@googletest//:gtest_main",
4445
]),
4546
)

‎sdk/test/configuration/BUILD‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ otel_cc_test(
2020
"//sdk/src/logs",
2121
"//sdk/src/metrics",
2222
"//sdk/src/trace",
23-
"@com_google_googletest//:gtest_main",
23+
"@googletest//:gtest_main",
2424
]),
2525
)
2626

@@ -40,7 +40,7 @@ otel_cc_test(
4040
"//sdk/src/logs",
4141
"//sdk/src/metrics",
4242
"//sdk/src/trace",
43-
"@com_google_googletest//:gtest_main",
43+
"@googletest//:gtest_main",
4444
]),
4545
)
4646

@@ -60,7 +60,7 @@ otel_cc_test(
6060
"//sdk/src/logs",
6161
"//sdk/src/metrics",
6262
"//sdk/src/trace",
63-
"@com_google_googletest//:gtest_main",
63+
"@googletest//:gtest_main",
6464
]),
6565
)
6666

@@ -80,7 +80,7 @@ otel_cc_test(
8080
"//sdk/src/logs",
8181
"//sdk/src/metrics",
8282
"//sdk/src/trace",
83-
"@com_google_googletest//:gtest_main",
83+
"@googletest//:gtest_main",
8484
]),
8585
)
8686

@@ -96,7 +96,7 @@ otel_cc_test(
9696
"//sdk/src/logs",
9797
"//sdk/src/metrics",
9898
"//sdk/src/trace",
99-
"@com_google_googletest//:gtest_main",
99+
"@googletest//:gtest_main",
100100
]),
101101
tags = [
102102
"test",
@@ -120,6 +120,6 @@ otel_cc_test(
120120
"//sdk/src/logs",
121121
"//sdk/src/metrics",
122122
"//sdk/src/trace",
123-
"@com_google_googletest//:gtest_main",
123+
"@googletest//:gtest_main",
124124
]),
125125
)

0 commit comments

Comments
 (0)