Skip to content

Commit 90e9cb7

Browse files
malkiamalkia
committed
Minimized what's get built into otel_sdk: otlp grpc and file, in memory, and ostream
1 parent 6685544 commit 90e9cb7

File tree

13 files changed

+70
-98
lines changed

13 files changed

+70
-98
lines changed

‎.bazelrc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ common:windows --shell_executable="c:\\program files\\git\\usr\\bin\\bash.exe"
2020
common --enable_platform_specific_config
2121
common --enable_runfiles
2222

23-
build --build_tag_filters=-jaeger,-opentracing,-opentracing_shim
24-
test --test_tag_filters=-jaeger,-opentracing,-opentracing_shim
23+
build --build_tag_filters=-jaeger,-opentracing,-opentracing_shim,-etw,-es,-prometheus,-otlp_http,-otlp_http_log,-otlp_http_metric,-zipkin
24+
test --test_tag_filters=-jaeger,-opentracing,-opentracing_shim,-etw,-es,-prometheus,-otlp_http,-otlp_http_log,-otlp_http_metric,-zipkin
2525

2626
build --experimental_convenience_symlinks=clean
2727

@@ -31,8 +31,8 @@ build:windows --copt="/Zc:strictStrings"
3131
build:windows --copt="/Gy"
3232
build:windows --host_linkopt="shell32.lib"
3333
# Requires Visual Studio 2019 Build Tools installed in default location with the latest compiler (14.29.30133) for x64
34-
build:windows --action_env=BAZEL_VC_FULL_VERSION=14.29.30133 --action_env=BAZEL_WINSDK_FULL_VERSION=10.0.22621.0
35-
build:windows --host_action_env=BAZEL_VC_FULL_VERSION=14.29.30133 --host_action_env=BAZEL_WINSDK_FULL_VERSION=10.0.22621.0
34+
build:windows --action_env=BAZEL_VC_FULL_VERSION=14.42.34433 --action_env=BAZEL_WINSDK_FULL_VERSION=10.0.22621.0
35+
build:windows --host_action_env=BAZEL_VC_FULL_VERSION=14.42.34433 --host_action_env=BAZEL_WINSDK_FULL_VERSION=10.0.22621.0
3636

3737
# Set minimum supported C++ version
3838
build:macos --host_cxxopt=-std=c++17 --cxxopt=-std=c++17

‎.github/workflows/otel_sdk_git_infra.yml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎BUILD‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ otel_cc_library(
6060
name = "otel_sdk_deps",
6161
visibility = ["//visibility:private"],
6262
deps = [
63-
"@otel_sdk//exporters/elasticsearch:es_log_record_exporter",
63+
# "@otel_sdk//exporters/elasticsearch:es_log_record_exporter",
6464
"@otel_sdk//exporters/memory:in_memory_data",
6565
"@otel_sdk//exporters/memory:in_memory_metric_data",
6666
"@otel_sdk//exporters/memory:in_memory_metric_exporter_factory",
@@ -75,14 +75,14 @@ otel_cc_library(
7575
"@otel_sdk//exporters/otlp:otlp_grpc_forward_proxy",
7676
"@otel_sdk//exporters/otlp:otlp_grpc_log_record_exporter",
7777
"@otel_sdk//exporters/otlp:otlp_grpc_metric_exporter",
78-
"@otel_sdk//exporters/otlp:otlp_http_exporter",
79-
"@otel_sdk//exporters/otlp:otlp_http_log_record_exporter",
80-
"@otel_sdk//exporters/otlp:otlp_http_metric_exporter",
81-
"@otel_sdk//exporters/prometheus:prometheus_exporter",
82-
"@otel_sdk//exporters/prometheus:prometheus_push_exporter",
83-
"@otel_sdk//exporters/zipkin:zipkin_exporter",
78+
# "@otel_sdk//exporters/otlp:otlp_http_exporter",
79+
# "@otel_sdk//exporters/otlp:otlp_http_log_record_exporter",
80+
# "@otel_sdk//exporters/otlp:otlp_http_metric_exporter",
81+
# "@otel_sdk//exporters/prometheus:prometheus_exporter",
82+
# "@otel_sdk//exporters/prometheus:prometheus_push_exporter",
83+
# "@otel_sdk//exporters/zipkin:zipkin_exporter",
8484
] + select({
85-
"@platforms//os:windows": ["@otel_sdk//exporters/etw:etw_exporter"],
85+
# "@platforms//os:windows": ["@otel_sdk//exporters/etw:etw_exporter"],
8686
"//conditions:default": [],
8787
}),
8888
)
@@ -92,11 +92,11 @@ otel_cc_library(
9292
name = "otel_sdk_all_deps_" + os,
9393
# The crude '^(@+otel_sdk[+~]?)?//' ignores external to otel_sdk repositories (e.g. @curl//, etc.) for which it's assumed we don't export dll symbols
9494
# In addition we exclude some internal libraries, that may have to be relinked by tests (like //sdk/src/common:random and //sdk/src/common/platform:fork)
95-
expression = "kind('cc_library',filter('^(@+otel_sdk[+~]?)?//',deps(@otel_sdk//:otel_sdk_deps) except set(@otel_sdk//:otel_sdk_deps @otel_sdk//sdk/src/common:random @otel_sdk//sdk/src/common/platform:fork @otel_sdk//:windows_only " + exceptions + ")))",
95+
expression = "kind('cc_library',filter('^(@+otel_sdk[+~]?)?//',deps(@otel_sdk//:otel_sdk_deps) except set(@otel_sdk//:otel_sdk_deps @otel_sdk//sdk/src/common:random @otel_sdk//sdk/src/common/platform:fork " + exceptions + ")))",
9696
scope = ["@otel_sdk//:otel_sdk_deps"],
9797
strict = True,
9898
) for (os, exceptions) in [
99-
("non_windows", "@otel_sdk//exporters/etw:etw_exporter"),
99+
("non_windows", ""), #"@otel_sdk//exporters/etw:etw_exporter"),
100100
("windows", ""),
101101
]]
102102

‎all_sdk_includes.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#if defined(_MSC_VER)
2-
#include <opentelemetry/exporters/etw/etw_logger.h>
3-
#include <opentelemetry/exporters/etw/etw_tracer.h>
4-
#endif
1+
// #if defined(_MSC_VER)
2+
// #include <opentelemetry/exporters/etw/etw_logger.h>
3+
// #include <opentelemetry/exporters/etw/etw_tracer.h>
4+
// #endif
55

66
#include <opentelemetry/exporters/otlp/otlp_grpc_forward_proxy.h>

‎dll_deps_generated_non_windows.bzl‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
DLL_DEPS = {
33
Label("@otel_sdk//api:api"): None,
44
Label("@otel_sdk//api:headers"): None,
5-
Label("@otel_sdk//exporters/elasticsearch:es_log_record_exporter"): None,
6-
Label("@otel_sdk//exporters/elasticsearch:headers"): None,
7-
Label("@otel_sdk//exporters/etw:headers"): None,
85
Label("@otel_sdk//exporters/memory:in_memory_data"): None,
96
Label("@otel_sdk//exporters/memory:in_memory_metric_data"): None,
107
Label("@otel_sdk//exporters/memory:in_memory_metric_exporter_factory"): None,
@@ -22,19 +19,8 @@ DLL_DEPS = {
2219
Label("@otel_sdk//exporters/otlp:otlp_grpc_forward_proxy"): None,
2320
Label("@otel_sdk//exporters/otlp:otlp_grpc_log_record_exporter"): None,
2421
Label("@otel_sdk//exporters/otlp:otlp_grpc_metric_exporter"): None,
25-
Label("@otel_sdk//exporters/otlp:otlp_http_client"): None,
26-
Label("@otel_sdk//exporters/otlp:otlp_http_exporter"): None,
27-
Label("@otel_sdk//exporters/otlp:otlp_http_log_record_exporter"): None,
28-
Label("@otel_sdk//exporters/otlp:otlp_http_metric_exporter"): None,
2922
Label("@otel_sdk//exporters/otlp:otlp_recordable"): None,
30-
Label("@otel_sdk//exporters/prometheus:prometheus_collector"): None,
31-
Label("@otel_sdk//exporters/prometheus:prometheus_exporter"): None,
32-
Label("@otel_sdk//exporters/prometheus:prometheus_exporter_utils"): None,
33-
Label("@otel_sdk//exporters/prometheus:prometheus_push_exporter"): None,
34-
Label("@otel_sdk//exporters/zipkin:zipkin_exporter"): None,
35-
Label("@otel_sdk//exporters/zipkin:zipkin_recordable"): None,
3623
Label("@otel_sdk//ext:headers"): None,
37-
Label("@otel_sdk//ext/src/http/client/curl:http_client_curl"): None,
3824
Label("@otel_sdk//sdk:headers"): None,
3925
Label("@otel_sdk//sdk/src/common:base64"): None,
4026
Label("@otel_sdk//sdk/src/common:disabled"): None,

‎dll_deps_generated_windows.bzl‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
DLL_DEPS = {
33
Label("@otel_sdk//api:api"): None,
44
Label("@otel_sdk//api:headers"): None,
5-
Label("@otel_sdk//exporters/elasticsearch:es_log_record_exporter"): None,
6-
Label("@otel_sdk//exporters/elasticsearch:headers"): None,
7-
Label("@otel_sdk//exporters/etw:etw_exporter"): None,
8-
Label("@otel_sdk//exporters/etw:headers"): None,
95
Label("@otel_sdk//exporters/memory:in_memory_data"): None,
106
Label("@otel_sdk//exporters/memory:in_memory_metric_data"): None,
117
Label("@otel_sdk//exporters/memory:in_memory_metric_exporter_factory"): None,
@@ -23,19 +19,8 @@ DLL_DEPS = {
2319
Label("@otel_sdk//exporters/otlp:otlp_grpc_forward_proxy"): None,
2420
Label("@otel_sdk//exporters/otlp:otlp_grpc_log_record_exporter"): None,
2521
Label("@otel_sdk//exporters/otlp:otlp_grpc_metric_exporter"): None,
26-
Label("@otel_sdk//exporters/otlp:otlp_http_client"): None,
27-
Label("@otel_sdk//exporters/otlp:otlp_http_exporter"): None,
28-
Label("@otel_sdk//exporters/otlp:otlp_http_log_record_exporter"): None,
29-
Label("@otel_sdk//exporters/otlp:otlp_http_metric_exporter"): None,
3022
Label("@otel_sdk//exporters/otlp:otlp_recordable"): None,
31-
Label("@otel_sdk//exporters/prometheus:prometheus_collector"): None,
32-
Label("@otel_sdk//exporters/prometheus:prometheus_exporter"): None,
33-
Label("@otel_sdk//exporters/prometheus:prometheus_exporter_utils"): None,
34-
Label("@otel_sdk//exporters/prometheus:prometheus_push_exporter"): None,
35-
Label("@otel_sdk//exporters/zipkin:zipkin_exporter"): None,
36-
Label("@otel_sdk//exporters/zipkin:zipkin_recordable"): None,
3723
Label("@otel_sdk//ext:headers"): None,
38-
Label("@otel_sdk//ext/src/http/client/curl:http_client_curl"): None,
3924
Label("@otel_sdk//sdk:headers"): None,
4025
Label("@otel_sdk//sdk/src/common:base64"): None,
4126
Label("@otel_sdk//sdk/src/common:disabled"): None,

‎examples/otlp/BUILD‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ otel_cc_binary(
157157
"examples",
158158
"metrics",
159159
"otlp",
160+
"otlp_http",
161+
"otlp_http_metric",
160162
],
161163
deps = dll_deps([
162164
"//api",

‎ext/test/http/curl_http_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ TEST_F(BasicCurlHttpTests, ElegantQuitQuick)
666666
// wait should be less than scheduled_delay_milliseconds_
667667
// Due to load on CI hosts (some take 10ms), we assert it is less than 20ms
668668
auto cost = std::chrono::system_clock::now() - beg;
669-
ASSERT_TRUE(cost < std::chrono::milliseconds{40})
669+
ASSERT_TRUE(cost < std::chrono::milliseconds{100})
670670
<< "cost ms: " << std::chrono::duration_cast<std::chrono::milliseconds>(cost).count()
671671
<< " libcurl version: 0x" << std::hex << LIBCURL_VERSION_NUM;
672672
ASSERT_TRUE(handler->is_called_);

‎functional/otlp/BUILD‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ otel_cc_binary(
1414
args = [
1515
"--list",
1616
],
17-
tags = ["otlp"],
17+
tags = [
18+
"otlp",
19+
"otlp_http",
20+
],
1821
deps = dll_deps([
1922
"//sdk/src/metrics",
2023
"//exporters/otlp:otlp_http_exporter",
@@ -29,7 +32,10 @@ otel_cc_binary(
2932
args = [
3033
"--list",
3134
],
32-
tags = ["otlp"],
35+
tags = [
36+
"otlp",
37+
"otlp_grpc",
38+
],
3339
deps = dll_deps([
3440
"//sdk/src/metrics",
3541
"//exporters/otlp:otlp_grpc_exporter",

‎install/test/src/BUILD‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,25 @@ load("//bazel:otel_cc.bzl", "otel_cc_test")
66

77
otel_cc_test(
88
name = "all_tests",
9-
srcs = glob(["*.cc"], exclude=["test_shims_opentracing.cc"]),
9+
srcs = glob(
10+
["*.cc"],
11+
exclude = [
12+
"test_shims_opentracing.cc",
13+
"test_exporters_elasticsearch.cc",
14+
"test_exporters_etw.cc",
15+
"test_exporters_otlp_http.cc",
16+
"test_exporters_prometheus.cc",
17+
"test_exporters_zipkin.cc",
18+
"test_ext_http_curl.cc",
19+
],
20+
),
1021
tags = [
1122
"test",
1223
],
1324
deps = dll_deps([
1425
"//api",
15-
"//exporters/elasticsearch:es_log_record_exporter",
16-
"//exporters/etw:etw_exporter",
26+
# "//exporters/elasticsearch:es_log_record_exporter",
27+
# "//exporters/etw:etw_exporter",
1728
"//exporters/memory:in_memory_metric_exporter_factory",
1829
"//exporters/memory:in_memory_span_exporter",
1930
"//exporters/ostream:ostream_log_record_exporter",
@@ -25,11 +36,11 @@ otel_cc_test(
2536
"//exporters/otlp:otlp_grpc_exporter",
2637
"//exporters/otlp:otlp_grpc_log_record_exporter",
2738
"//exporters/otlp:otlp_grpc_metric_exporter",
28-
"//exporters/otlp:otlp_http_exporter",
29-
"//exporters/otlp:otlp_http_log_record_exporter",
30-
"//exporters/otlp:otlp_http_metric_exporter",
31-
"//exporters/prometheus:prometheus_exporter",
32-
"//exporters/zipkin:zipkin_exporter",
39+
# "//exporters/otlp:otlp_http_exporter",
40+
# "//exporters/otlp:otlp_http_log_record_exporter",
41+
# "//exporters/otlp:otlp_http_metric_exporter",
42+
# "//exporters/prometheus:prometheus_exporter",
43+
# "//exporters/zipkin:zipkin_exporter",
3344
"//sdk/src/logs",
3445
"//sdk/src/metrics",
3546
"//sdk/src/resource",

0 commit comments

Comments
 (0)