Merge branch 'main' of https://github.com/malkia/opentelemetry-cpp

Author: malkia

bazel/otel_cc.bzl

@@ -43,6 +43,10 @@ def otel_cc_library(**kwargs):
 
     rules_cc_library(**kwargs)
 
+def otel_cc_test_library(**kwargs):
+    kwargs["testonly"] = kwargs.get("testonly", True)
+    otel_cc_library(**kwargs)
+
 def otel_cc_binary(**kwargs):
     rules_cc_binary(**kwargs)
 

exporters/elasticsearch/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_library", "otel_cc_test")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -16,14 +16,6 @@ otel_cc_library(
         "include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h",
         "include/opentelemetry/exporters/elasticsearch/es_log_recordable.h",
     ],
-    linkopts = select({
-        "//bazel:windows": [
-            "-DEFAULTLIB:advapi32.lib",
-            "-DEFAULTLIB:crypt32.lib",
-            "-DEFAULTLIB:Normaliz.lib",
-        ],
-        "//conditions:default": [],
-    }),
     strip_include_prefix = "include",
     tags = ["es"],
     deps = [

exporters/ostream/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_library", "otel_cc_test_library", "otel_cc_test")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -89,9 +89,8 @@ otel_cc_library(
     ],
 )
 
-otel_cc_library(
+otel_cc_test_library(
     name = "ostream_capture",
-    testonly = 1,
     hdrs = [
         "test/ostream_capture.h",
     ],

exporters/prometheus/BUILD

@@ -2,8 +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_import", "otel_cc_library", "otel_cc_shared_library", "otel_cc_test")
+load("//bazel:otel_cc.bzl", "otel_cc_library", "otel_cc_test_library", "otel_cc_test")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -68,9 +67,8 @@ otel_cc_library(
     ],
 )
 
-otel_cc_library(
+otel_cc_test_library(
     name = "prometheus_test_helper",
-    testonly = 1,
     hdrs = [
         "test/prometheus_test_helper.h",
     ],
@@ -163,9 +161,8 @@ otel_cc_library(
     ],
 )
 
-otel_cc_library(
+otel_cc_test_library(
     name = "prometheus_push_test_helper",
-    testonly = 1,
     hdrs = [
         "test/prometheus_push_test_helper.h",
     ],

functional/otlp/BUILD

@@ -1,9 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
+load("//bazel:otel_cc.bzl", "otel_cc_binary")
 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")
 
 package(default_visibility = ["//visibility:public"])
 

sdk/test/common/BUILD

@@ -3,7 +3,7 @@
 
 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_test_library", "otel_cc_test")
 
 otel_cc_test(
     name = "random_test",
@@ -98,9 +98,8 @@ otel_cc_test(
     ]),
 )
 
-otel_cc_library(
+otel_cc_test_library(
     name = "baseline_circular_buffer",
-    testonly = 1,
     hdrs = [
         "baseline_circular_buffer.h",
     ],

sdk/test/metrics/BUILD

@@ -2,12 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 load("//:dll_deps.bzl", "dll_deps")
-load("//bazel:otel_cc.bzl", "otel_cc_library", "otel_cc_test")
+load("//bazel:otel_cc.bzl", "otel_cc_library", "otel_cc_test_library", "otel_cc_test")
 load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
 
-otel_cc_library(
+otel_cc_test_library(
     name = "metrics_common_test_utils",
-    testonly = 1,
     srcs = [
         "common.cc",
     ],
@@ -21,21 +20,6 @@ otel_cc_library(
     ]),
 )
 
-otel_cc_test(
-    name = "meter_config_test",
-    srcs = [
-        "meter_config_test.cc",
-    ],
-    tags = [
-        "metrics",
-        "test",
-    ],
-    deps = dll_deps([
-        "metrics_common_test_utils",
-        "@googletest//:gtest_main",
-    ]),
-)
-
 otel_cc_test(
     name = "all_tests",
     srcs = glob(["*_test.cc"]),