minor cleanup, removed some older bazel code

malkia · malkia · commit 72313608c497 · 2025-05-02T18:41:11.000-07:00
diff --git a/api/BUILD b/api/BUILD
@@ -7,30 +7,20 @@ load("//bazel:otel_cc.bzl", "otel_cc_library")
 package(default_visibility = ["//visibility:public"])
 
 CPP_STDLIBS = [
-    "none",
-    "best",
-    "2014",
     "2017",
     "2020",
     "2023",
 ]
 
 string_flag(
     name = "with_cxx_stdlib",
-    build_setting_default = "best",
+    build_setting_default = "2017",
     values = CPP_STDLIBS,
 )
 
 otel_cc_library(
     name = "api",
     defines = select({
-        ":set_cxx_stdlib_none": [],
-        ### automatic selection
-        ":set_cxx_stdlib_best": ["OPENTELEMETRY_STL_VERSION=(__cplusplus/100)"],
-        # See https://learn.microsoft.com/en-us/cpp/build/reference/zc-cplusplus
-        ":set_cxx_stdlib_best_and_msvc": ["OPENTELEMETRY_STL_VERSION=(_MSVC_LANG/100)"],
-        ### manual selection
-        ":set_cxx_stdlib_2014": ["OPENTELEMETRY_STL_VERSION=2014"],
         ":set_cxx_stdlib_2017": ["OPENTELEMETRY_STL_VERSION=2017"],
         ":set_cxx_stdlib_2020": ["OPENTELEMETRY_STL_VERSION=2020"],
         ":set_cxx_stdlib_2023": ["OPENTELEMETRY_STL_VERSION=2023"],
@@ -71,15 +61,9 @@ filegroup(
     },
 ) for v in CPP_STDLIBS]
 
-config_setting(
-    name = "set_cxx_stdlib_best_and_msvc",
-    constraint_values = ["@bazel_tools//tools/cpp:msvc"],
-    flag_values = {":with_cxx_stdlib": "best"},
-)
-
 int_flag(
     name = "abi_version_no",
-    build_setting_default = 1,
+    build_setting_default = 2,
 )
 
 config_setting(
diff --git a/api/test/baggage/BUILD b/api/test/baggage/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")
 
 otel_cc_test(
     name = "baggage_test",
diff --git a/api/test/baggage/propagation/BUILD b/api/test/baggage/propagation/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("//: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 = "baggage_propagator_test",
diff --git a/api/test/common/BUILD b/api/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")
 
 otel_cc_benchmark(
     name = "spinlock_benchmark",
diff --git a/api/test/context/BUILD b/api/test/context/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("//: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 = "context_test",
diff --git a/api/test/context/propagation/BUILD b/api/test/context/propagation/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("//: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 = "composite_propagator_test",
diff --git a/api/test/core/BUILD b/api/test/core/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_test")
 
 otel_cc_test(
     name = "timestamp_test",
diff --git a/api/test/logs/BUILD b/api/test/logs/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_test")
 
 otel_cc_test(
     name = "provider_test",
diff --git a/api/test/metrics/BUILD b/api/test/metrics/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_test")
 
 otel_cc_test(
     name = "noop_sync_instrument_test",
diff --git a/api/test/nostd/BUILD b/api/test/nostd/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_test")
 
 otel_cc_test(
     name = "function_ref_test",
diff --git a/api/test/singleton/BUILD b/api/test/singleton/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_library", "otel_cc_shared_library", "otel_cc_test")
 
 DEFAULT_WIN_COPTS = [
 ]
diff --git a/api/test/singleton/singleton_test.cc b/api/test/singleton/singleton_test.cc
@@ -349,14 +349,6 @@ void cleanup_otel()
   trace_api::Provider::SetTracerProvider(provider);
 }
 
-// TODO: Remove once windows api singletons are supported.
-// See https://github.com/open-telemetry/opentelemetry-cpp/issues/2534
-#ifdef _WIN32
-#  define RUN_FAILING_WINDOWS_TEST 1
-#else
-#  define RUN_FAILING_WINDOWS_TEST 1
-#endif
-
 TEST(SingletonTest, Uniqueness)
 {
   do_something();
@@ -399,7 +391,6 @@ TEST(SingletonTest, Uniqueness)
   EXPECT_EQ(span_b_f1_count, 2);
   EXPECT_EQ(span_b_f2_count, 1);
 
-#if RUN_FAILING_WINDOWS_TEST
   EXPECT_EQ(span_c_lib_count, 1);  // Fails with shared libraries on Windows
   EXPECT_EQ(span_c_f1_count, 2);   // Fails with shared libraries on Windows
   EXPECT_EQ(span_c_f2_count, 1);   // Fails with shared libraries on Windows
@@ -412,18 +403,13 @@ TEST(SingletonTest, Uniqueness)
   EXPECT_EQ(span_f_lib_count, 1);  // Fails with shared libraries on Windows
   EXPECT_EQ(span_f_f1_count, 2);   // Fails with shared libraries on Windows
   EXPECT_EQ(span_f_f2_count, 1);   // Fails with shared libraries on Windows
-#endif
 
-#ifndef BAZEL_BUILD
-#  if RUN_FAILING_WINDOWS_TEST
   EXPECT_EQ(span_g_lib_count, 1);  // Fails with shared libraries on Windows
   EXPECT_EQ(span_g_f1_count, 2);   // Fails with shared libraries on Windows
   EXPECT_EQ(span_g_f2_count, 1);   // Fails with shared libraries on Windows
   EXPECT_EQ(span_h_lib_count, 1);  // Fails with shared libraries on Windows
   EXPECT_EQ(span_h_f1_count, 2);   // Fails with shared libraries on Windows
   EXPECT_EQ(span_h_f2_count, 1);   // Fails with shared libraries on Windows
-#  endif
-#endif
 
   EXPECT_EQ(unknown_span_count, 0);
 
diff --git a/api/test/trace/BUILD b/api/test/trace/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")
 
 otel_cc_test(
     name = "default_span_test",
diff --git a/api/test/trace/propagation/BUILD b/api/test/trace/propagation/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("//: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 = "http_text_format_test",
diff --git a/api/test/trace/propagation/detail/BUILD b/api/test/trace/propagation/detail/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("//: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 = "hex_test",
@@ -21,7 +20,7 @@ otel_cc_test(
     ]),
 )
 
-cc_test(
+otel_cc_test(
     name = "string_test",
     srcs = [
         "string_test.cc",
