From 99d1fc60672c888d8c936bbe9106478c1269738e Mon Sep 17 00:00:00 2001
From: Dimiter 'malkia' Stanev <malkia@gmail.com>
Date: Mon, 21 Aug 2023 21:49:37 -0700
Subject: [PATCH] some minor missed dll_deps additions

---
 BUILD                                     |  2 +-
 api/test/singleton/BUILD                  |  8 ++++----
 dll_deps_update.cpp => dll_deps_update.cc |  0
 opentracing-shim/BUILD                    | 22 ++++++++++++----------
 otel_sdk_build.cmd                        |  1 -
 sdk/test/common/BUILD                     |  6 +++---
 6 files changed, 20 insertions(+), 19 deletions(-)
 rename dll_deps_update.cpp => dll_deps_update.cc (100%)

diff --git a/BUILD b/BUILD
index cffd2ce5b2..5546796d9d 100644
--- a/BUILD
+++ b/BUILD
@@ -361,7 +361,7 @@ pkg_zip(
 
 cc_binary(
     name = "dll_deps_update_binary",
-    srcs = ["dll_deps_update.cpp"],
+    srcs = ["dll_deps_update.cc"],
     data = ["otel_sdk_all_project_deps"],
     local_defines = ['DEPS_FILE=\\"$(rlocationpath otel_sdk_all_project_deps)\\"'],
     deps = ["@bazel_tools//tools/cpp/runfiles"],
diff --git a/api/test/singleton/BUILD b/api/test/singleton/BUILD
index 9093ccf5d6..9af3c40874 100644
--- a/api/test/singleton/BUILD
+++ b/api/test/singleton/BUILD
@@ -130,9 +130,9 @@ cc_binary(
         "//conditions:default": DEFAULT_NOWIN_COPTS,
     }),
     linkshared = True,
-    deps = [
+    deps = dll_deps([
         "//api",
-    ],
+    ]),
 )
 
 # no cc_shared_library in bazel 4.2
@@ -146,9 +146,9 @@ cc_binary(
         "//conditions:default": HIDDEN_NOWIN_COPTS,
     }),
     linkshared = True,
-    deps = [
+    deps = dll_deps([
         "//api",
-    ],
+    ]),
 )
 
 #
diff --git a/dll_deps_update.cpp b/dll_deps_update.cc
similarity index 100%
rename from dll_deps_update.cpp
rename to dll_deps_update.cc
diff --git a/opentracing-shim/BUILD b/opentracing-shim/BUILD
index e7d90a4b4d..b5e737823b 100644
--- a/opentracing-shim/BUILD
+++ b/opentracing-shim/BUILD
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("//:dll_deps.bzl", "dll_deps")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
@@ -36,10 +38,10 @@ cc_test(
         "opentracing_shim",
         "test",
     ],
-    deps = [
+    deps = dll_deps([
         ":opentracing_shim",
         "@com_google_googletest//:gtest_main",
-    ],
+    ]),
 )
 
 cc_test(
@@ -52,10 +54,10 @@ cc_test(
         "opentracing_shim",
         "test",
     ],
-    deps = [
+    deps = dll_deps([
         ":opentracing_shim",
         "@com_google_googletest//:gtest_main",
-    ],
+    ]),
 )
 
 cc_test(
@@ -68,10 +70,10 @@ cc_test(
         "opentracing_shim",
         "test",
     ],
-    deps = [
+    deps = dll_deps([
         ":opentracing_shim",
         "@com_google_googletest//:gtest_main",
-    ],
+    ]),
 )
 
 cc_test(
@@ -83,10 +85,10 @@ cc_test(
         "opentracing_shim",
         "test",
     ],
-    deps = [
+    deps = dll_deps([
         ":opentracing_shim",
         "@com_google_googletest//:gtest_main",
-    ],
+    ]),
 )
 
 cc_test(
@@ -99,8 +101,8 @@ cc_test(
         "opentracing_shim",
         "test",
     ],
-    deps = [
+    deps = dll_deps([
         ":opentracing_shim",
         "@com_google_googletest//:gtest_main",
-    ],
+    ]),
 )
diff --git a/otel_sdk_build.cmd b/otel_sdk_build.cmd
index 644dfe51ba..805adf7ffa 100644
--- a/otel_sdk_build.cmd
+++ b/otel_sdk_build.cmd
@@ -17,7 +17,6 @@ rem Note that `otel_sdk.zip` is built here for the default fastdbg (e.g. when no
 "%__BAZEL__%" build --//:with_dll=true ... || goto:error
 
 rem We can't test dbg, fastbuild and opt at the same time, as done above ^^^ (no config "transition" possible when doing testing (AFAIK))
-rem TODO: Fix failing tests in debug only (e.g. add back the || goto:error)
 "%__BAZEL__%" test --//:with_dll=true --test_size_filters=small,medium,large,enormous --test_timeout_filters=short,moderate,long,eternal --test_verbose_timeout_warnings -c dbg ... || goto:error
 "%__BAZEL__%" test --//:with_dll=true --test_size_filters=small,medium,large,enormous --test_timeout_filters=short,moderate,long,eternal --test_verbose_timeout_warnings -c fastbuild ... || goto:error
 "%__BAZEL__%" test --//:with_dll=true --test_size_filters=small,medium,large,enormous --test_timeout_filters=short,moderate,long,eternal --test_verbose_timeout_warnings -c opt ... || goto:error
diff --git a/sdk/test/common/BUILD b/sdk/test/common/BUILD
index 1829695076..c1831a39cb 100644
--- a/sdk/test/common/BUILD
+++ b/sdk/test/common/BUILD
@@ -22,10 +22,10 @@ cc_test(
         "base64_test.cc",
     ],
     tags = ["test"],
-    deps = [
+    deps = dll_deps([
         "//sdk/src/common:base64",
         "@com_google_googletest//:gtest_main",
-    ],
+    ]),
 )
 
 cc_test(
@@ -47,7 +47,7 @@ otel_cc_benchmark(
         "benchmark",
         "test",
     ],
-    deps = ["//sdk/src/common:base64"],
+    deps = dll_deps(["//sdk/src/common:base64"]),
 )
 
 otel_cc_benchmark(