cleanup

Author: malkia

api/BUILD

@@ -1,8 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "int_flag", "string_flag")
-load("//bazel:otel_cc.bzl", "otel_cc_binary", "otel_cc_import", "otel_cc_library", "otel_cc_shared_library", "otel_cc_test")
+load("@bazel_skylib//rules:common_settings.bzl", "int_flag", "string_flag")
+load("//bazel:otel_cc.bzl", "otel_cc_library")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -23,7 +23,6 @@ string_flag(
 
 otel_cc_library(
     name = "api",
-    hdrs = glob(["include/**/*.h"]),
     defines = ["HAVE_ABSEIL"] + select({
         ":set_cxx_stdlib_none": [],
         ### automatic selection
@@ -43,9 +42,9 @@ otel_cc_library(
         ":abi_version_no_1": ["OPENTELEMETRY_ABI_VERSION_NO=1"],
         ":abi_version_no_2": ["OPENTELEMETRY_ABI_VERSION_NO=2"],
     }),
-    strip_include_prefix = "include",
     tags = ["api"],
     deps = [
+        "headers",
         "@abseil-cpp//absl/base",
         "@abseil-cpp//absl/strings",
         "@abseil-cpp//absl/types:variant",

api/test/plugin/BUILD

@@ -2,16 +2,17 @@
 # SPDX-License-Identifier: Apache-2.0
 
 load("//:dll_deps.bzl", "dll_deps")
-load("//bazel:otel_cc.bzl", "otel_cc_binary", "otel_cc_import", "otel_cc_library", "otel_cc_shared_library", "otel_cc_test")
+load("//bazel:otel_cc.bzl", "otel_cc_test")
 
 otel_cc_test(
     name = "dynamic_load_test",
     srcs = [
         "dynamic_load_test.cc",
     ],
-    linkopts = [
-        "-ldl",
-    ],
+    linkopts = select({
+        "//bazel:windows": [],
+        "//conditions:default": ["-ldl"],
+    }),
     tags = [
         "api",
         "test",

api/test/singleton/BUILD

@@ -174,9 +174,10 @@ otel_cc_test(
         "component_g",
         "component_h",
     ],
-    linkopts = [
-        "-ldl",
-    ],
+    linkopts = select({
+        "//bazel:windows": [],
+        "//conditions:default": ["-ldl"],
+    }),
     linkstatic = False,
     tags = [
         "api",

examples/batch/BUILD

@@ -9,7 +9,10 @@ otel_cc_binary(
     srcs = [
         "main.cc",
     ],
-    linkopts = ["-lpthread"],
+    linkopts = select({
+        "//bazel:windows": [],
+        "//conditions:default": ["-pthread"],
+    }),
     tags = ["ostream"],
     deps = dll_deps([
         "//api",

examples/metrics_simple/BUILD

@@ -9,7 +9,10 @@ otel_cc_binary(
     srcs = [
         "metrics_ostream.cc",
     ],
-    linkopts = ["-pthread"],
+    linkopts = select({
+        "//bazel:windows": [],
+        "//conditions:default": ["-pthread"],
+    }),
     tags = ["ostream"],
     deps = dll_deps([
         "//api",

examples/plugin/load/BUILD

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 load("//:dll_deps.bzl", "dll_deps")
-load("//bazel:otel_cc.bzl", "otel_cc_binary", "otel_cc_import", "otel_cc_library", "otel_cc_shared_library", "otel_cc_test")
+load("//bazel:otel_cc.bzl", "otel_cc_binary")
 
 otel_cc_binary(
     name = "load_plugin",
@@ -14,9 +14,10 @@ otel_cc_binary(
         # This argument here is a dummy config file, that's been read and ignored
         "$(rootpath //examples/plugin/plugin:example_plugin.so)",
     ],
-    linkopts = [
-        "-ldl",
-    ],
+    linkopts = select({
+        "//bazel:windows": [],
+        "//conditions:default": ["-ldl"],
+    }),
     deps = dll_deps([
         "//api",
         "//examples/plugin/plugin:example_plugin.so",

examples/prometheus/BUILD

@@ -9,7 +9,10 @@ otel_cc_binary(
     srcs = [
         "main.cc",
     ],
-    linkopts = ["-pthread"],
+    linkopts = select({
+        "//bazel:windows": [],
+        "//conditions:default": ["-pthread"],
+    }),
     tags = ["prometheus"],
     deps = dll_deps([
         "//api",

exporters/elasticsearch/BUILD

@@ -12,17 +12,12 @@ otel_cc_library(
         "src/es_log_record_exporter.cc",
         "src/es_log_recordable.cc",
     ],
-    hdrs = [
-        "include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h",
-        "include/opentelemetry/exporters/elasticsearch/es_log_recordable.h",
-    ],
-    strip_include_prefix = "include",
     tags = ["es"],
     deps = [
+        "headers",
         "//ext:headers",
         "//ext/src/http/client/curl:http_client_curl",
         "//sdk/src/logs",
-        "@curl",
         "@nlohmann_json//:json",
     ],
 )
@@ -37,7 +32,6 @@ otel_cc_test(
     deps = dll_deps([
         ":es_log_record_exporter",
         "@googletest//:gtest_main",
-        "@curl",
         # This was not exported in the "dll" version, hence it needs to be linked in statically
         # In the non-dll version, it'll be just a duplicate dependency, and would be ignored
         "@nlohmann_json//:json",

exporters/etw/BUILD

@@ -1,23 +1,20 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
 load("//:dll_deps.bzl", "dll_deps")
-load("//bazel:otel_cc.bzl", "otel_cc_binary", "otel_cc_import", "otel_cc_library", "otel_cc_shared_library", "otel_cc_test")
+load("//bazel:otel_cc.bzl", "otel_cc_library", "otel_cc_test")
+load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
 
 package(default_visibility = ["//visibility:public"])
 
 otel_cc_library(
     name = "etw_exporter",
-    hdrs = glob([
-        "include/opentelemetry/exporters/etw/*.h",
-    ]),
-    includes = ["include"],
     local_defines = [
         "HAVE_MSGPACK",
     ],
     tags = ["etw"],
     deps = [
+        "headers",
         "//:windows_only",
         "//api",
         "//sdk/src/trace",