reformat and lint

malkia · malkia · commit 4f17dc3b1e80 · 2025-07-21T12:26:18.000-07:00
diff --git a/.bazelignore b/.bazelignore
@@ -14,3 +14,5 @@ WORKSPACE
 otel_sdk_build.cmd
 .git
 x
+sdk/src/configuration
+sdk/test/configuration
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_library", "otel_cc_shared_library", "otel_cc_test")
+load("//bazel:otel_cc.bzl", "otel_cc_binary", "otel_cc_library", "otel_cc_test")
 
 DEFAULT_WIN_COPTS = [
 ]
diff --git a/bazel/otel_cc.bzl b/bazel/otel_cc.bzl
@@ -1,6 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
+load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library")
 load(
     "@rules_cc//cc:defs.bzl",
     rules_cc_binary = "cc_binary",
@@ -40,4 +41,4 @@ def otel_cc_import(**kwargs):
 
 def otel_cc_shared_library(**kwargs):
     kwargs["deps"] = kwargs.get("deps", []) + if_asanwin(["@llvm_windows_install//:asan"])
-    native.cc_shared_library(**kwargs)
+    cc_shared_library(**kwargs)
diff --git a/dll_deps.bzl b/dll_deps.bzl
@@ -1,4 +1,3 @@
-load("@otel_sdk//:dll_deps_generated_non_windows.bzl", dll_deps_non_windows = "DLL_DEPS")
 load("@otel_sdk//:dll_deps_generated_windows.bzl", dll_deps_windows = "DLL_DEPS")
 
 # Filter libs that were compiled into the the otel_sdk.dll already
diff --git a/examples/batch/BUILD b/examples/batch/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 = "example_simple",
diff --git a/examples/common/foo_library/BUILD b/examples/common/foo_library/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")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/examples/common/logs_foo_library/BUILD b/examples/common/logs_foo_library/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")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/examples/common/metrics_foo_library/BUILD b/examples/common/metrics_foo_library/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")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/examples/etw_threads/BUILD b/examples/etw_threads/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 = "etw_threadpool",
diff --git a/examples/grpc/BUILD b/examples/grpc/BUILD
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 load("@grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
+load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("//:dll_deps.bzl", "dll_deps")
 load("//bazel:otel_cc.bzl", "otel_cc_binary", "otel_cc_library")
diff --git a/examples/http/BUILD b/examples/http/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 = "example_http_client",
diff --git a/examples/logs_simple/BUILD b/examples/logs_simple/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 = "example_logs_simple",
diff --git a/examples/metrics_simple/BUILD b/examples/metrics_simple/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 = "metrics_ostream_example",
diff --git a/examples/multi_processor/BUILD b/examples/multi_processor/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 = "example_multi_processor",
diff --git a/examples/multithreaded/BUILD b/examples/multithreaded/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 = "example_multithreaded",
diff --git a/examples/plugin/plugin/BUILD b/examples/plugin/plugin/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 = "example_plugin.so",
diff --git a/examples/prometheus/BUILD b/examples/prometheus/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 = "prometheus_example",
diff --git a/examples/simple/BUILD b/examples/simple/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 = "example_simple",
diff --git a/examples/zipkin/BUILD b/examples/zipkin/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")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/exporters/otlp/BUILD b/exporters/otlp/BUILD
@@ -1,9 +1,8 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 load("//:dll_deps.bzl", "dll_deps")
-load("//bazel:otel_cc.bzl", "otel_cc_binary", "otel_cc_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"])
diff --git a/exporters/zipkin/BUILD b/exporters/zipkin/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"])
 
diff --git a/ext/BUILD b/ext/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-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")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/ext/test/http/BUILD b/ext/test/http/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 = "curl_http_test",
diff --git a/ext/test/w3c_tracecontext_http_test_server/BUILD b/ext/test/w3c_tracecontext_http_test_server/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 = "w3c_tracecontext_http_test_server",
diff --git a/multitool.lock.json b/multitool.lock.json
@@ -122,6 +122,18 @@
       }
     ]
   },
+  "nomad": {
+    "binaries": [
+      {
+        "kind": "archive",
+        "url": "https://releases.hashicorp.com/nomad/1.10.3/nomad_1.10.3_windows_amd64.zip",
+        "file": "nomad.exe",
+        "sha256": "dd97d5c36b0784b5c1603d4d1a0ccbe50ed68a469aeaa6d7733b89d35b14a8b2",
+        "os": "windows",
+        "cpu": "x86_64"
+      }
+    ]
+  },
   "otelcol-contrib": {
     "binaries": [
       {
diff --git a/reformat.cmd b/reformat.cmd
@@ -0,0 +1,3 @@
+@echo off
+pushd "%~dp0"
+bazel run @multitool//tools/buildifier:cwd -- -lint fix -mode fix -v -r .
diff --git a/sdk/BUILD b/sdk/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-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")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/sdk/src/common/BUILD b/sdk/src/common/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-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")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/sdk/src/common/platform/BUILD b/sdk/src/common/platform/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-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")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/sdk/src/logs/BUILD b/sdk/src/logs/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-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")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/sdk/src/metrics/BUILD b/sdk/src/metrics/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-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")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/sdk/src/resource/BUILD b/sdk/src/resource/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-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")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/sdk/src/trace/BUILD b/sdk/src/trace/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-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")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/sdk/test/instrumentationscope/BUILD b/sdk/test/instrumentationscope/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 = "instrumentationscope_test",
diff --git a/sdk/test/logs/BUILD b/sdk/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 = "logger_provider_sdk_test",
diff --git a/sdk/test/metrics/BUILD b/sdk/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_library", "otel_cc_test", "otel_cc_test_library")
+load("//bazel:otel_cc.bzl", "otel_cc_test", "otel_cc_test_library")
 load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
 
 otel_cc_test_library(
diff --git a/sdk/test/resource/BUILD b/sdk/test/resource/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 = "resource_test",
diff --git a/sdk/test/trace/BUILD b/sdk/test/trace/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")
 load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
 
 otel_cc_test(
diff --git a/test_common/BUILD b/test_common/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-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")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/test_common/src/http/client/nosend/BUILD b/test_common/src/http/client/nosend/BUILD
@@ -1,7 +1,7 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-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")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/x/BUILD.bazel b/x/BUILD.bazel
@@ -1,6 +1,4 @@
-load("@aspect_bazel_lib//lib:copy_directory.bzl", "copy_directory")
-load("@aspect_bazel_lib//lib:run_binary.bzl", "run_binary")
-load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/x/hang/BUILD.bazel b/x/hang/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@otel_sdk//:dll_deps.bzl", "dll_deps")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 cc_test(
     name = "hang",
diff --git a/x/haydoggo/BUILD.bazel b/x/haydoggo/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 cc_test(
     name = "hang",
     srcs = ["hang.cc"],
diff --git a/x/rsomla1/BUILD.bazel b/x/rsomla1/BUILD.bazel
@@ -1,3 +1,8 @@
+load("@rules_cc//cc:cc_import.bzl", "cc_import")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 # Plain C/C++ library declaration
 cc_library(
     name = "lib_plain",

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,5 @@ WORKSPACE`
`14`	`14`	`otel_sdk_build.cmd`
`15`	`15`	`.git`
`16`	`16`	`x`
	`17`	`+sdk/src/configuration`
	`18`	`+sdk/test/configuration`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`	`4`	`load("//:dll_deps.bzl", "dll_deps")`
`5`		`-load("//bazel:otel_cc.bzl", "otel_cc_binary", "otel_cc_library", "otel_cc_shared_library", "otel_cc_test")`
	`5`	`+load("//bazel:otel_cc.bzl", "otel_cc_binary", "otel_cc_library", "otel_cc_test")`
`6`	`6`
`7`	`7`	`DEFAULT_WIN_COPTS = [`
`8`	`8`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-load("@otel_sdk//:dll_deps_generated_non_windows.bzl", dll_deps_non_windows = "DLL_DEPS")`
`2`	`1`	`load("@otel_sdk//:dll_deps_generated_windows.bzl", dll_deps_windows = "DLL_DEPS")`
`3`	`2`
`4`	`3`	`# Filter libs that were compiled into the the otel_sdk.dll already`