diff --git a/.github/workflows/otel_sdk.yml b/.github/workflows/otel_sdk.yml
index 21df8e4bd4..40ced65deb 100644
--- a/.github/workflows/otel_sdk.yml
+++ b/.github/workflows/otel_sdk.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - run: systeminfo
       - run: Get-ChildItem env:* | Sort-Object -Property Name | Format-Table -AutoSize
-      - run: choco upgrade llvm --version 18.1.6
+      - run: winget upgrade LLVM.LLVM --version 18.1.8 --silent
       - uses: actions/checkout@v4
       - uses: actions/cache/restore@v4
         with:
diff --git a/bazel/otel_cc.bzl b/bazel/otel_cc.bzl
index 73e8adf8fb..a887c98cc0 100644
--- a/bazel/otel_cc.bzl
+++ b/bazel/otel_cc.bzl
@@ -9,6 +9,13 @@ load("@rules_cc//cc:defs.bzl",
 )
 
 def otel_cc_library(**kwargs):
+    # dump = kwargs["name"] + ": "
+    # dump = dump + " mod=" + native.module_name() 
+    # dump = dump + " ver=" + native.module_version()
+    # dump = dump + " pkg=" + native.package_name()
+    # dump = dump + " repo=" + native.repo_name()
+    # print(dump)
+
     # Link as .o (.obj) files, not .a (.lib)
     kwargs["alwayslink"] = kwargs.get("alwayslink", True)
 
diff --git a/bazel/otel_cc_benchmark.bzl b/bazel/otel_cc_benchmark.bzl
index 10f5a0da66..06cbec0237 100644
--- a/bazel/otel_cc_benchmark.bzl
+++ b/bazel/otel_cc_benchmark.bzl
@@ -1,6 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("otel_cc.bzl", "otel_cc_binary", "otel_cc_test")
+
 def otel_cc_benchmark(name, srcs, deps, tags = [""]):
     """
     Creates targets for the benchmark and related targets.
@@ -22,7 +24,7 @@ def otel_cc_benchmark(name, srcs, deps, tags = [""]):
 
     # This is the benchmark as a binary, it can be run manually, and is used
     # to generate the _result below.
-    native.cc_binary(
+    otel_cc_binary(
         name = name,
         srcs = srcs,
         deps = deps + ["@google_benchmark//:benchmark"],
@@ -41,7 +43,7 @@ def otel_cc_benchmark(name, srcs, deps, tags = [""]):
 
     # This is run as part of "bazel test ..." to smoke-test benchmarks. It's
     # meant to complete quickly rather than get accurate results.
-    native.cc_test(
+    otel_cc_test(
         name = name + "_smoketest",
         srcs = srcs,
         deps = deps + ["@google_benchmark//:benchmark"],