deps: More renaming for bzlmod alignment

DEPENDENCY_POLICY.md

@@ -19,7 +19,7 @@ in either [bazel/repository_locations.bzl](bazel/repository_locations.bzl) or
 An example entry for the `nghttp2` dependency is:
 
 ```python
-com_github_nghttp2_nghttp2 = dict(
+nghttp2 = dict(
     project_name = "Nghttp2",
     project_desc = "Implementation of HTTP/2 and its header compression ...",
     project_url = "https://nghttp2.org",

api/MODULE.bazel

@@ -6,34 +6,29 @@ module(
 # All bazel_dep entries are organized alphabetically for improved readability.
 
 # Core dependencies from Bazel Central Registry
-bazel_dep(name = "abseil-cpp", version = "20250814.1", repo_name = "com_google_absl")
+bazel_dep(name = "abseil-cpp", version = "20250814.1")
 bazel_dep(name = "bazel_skylib", version = "1.8.2")
-bazel_dep(name = "cel-spec", version = "0.25.1", repo_name = "dev_cel")
-bazel_dep(name = "gazelle", version = "0.47.0", repo_name = "bazel_gazelle")
-bazel_dep(name = "googleapis", version = "0.0.0-20251003-2193a2bf", repo_name = "com_google_googleapis")
+bazel_dep(name = "gazelle", version = "0.47.0", repo_name = "gazelle")
+bazel_dep(name = "googleapis", version = "0.0.0-20251003-2193a2bf")
 bazel_dep(name = "googleapis-cc", version = "1.0.0")
 bazel_dep(name = "googleapis-go", version = "1.0.0")
 bazel_dep(name = "googleapis-java", version = "1.0.0")
 bazel_dep(name = "grpc", version = "1.76.0.bcr.1", repo_name = "com_github_grpc_grpc")
-bazel_dep(name = "opencensus-proto", version = "0.4.1.bcr.2", repo_name = "opencensus_proto")
-bazel_dep(name = "opentelemetry-proto", version = "1.8.0", repo_name = "opentelemetry_proto")
+bazel_dep(name = "opentelemetry-proto", version = "1.8.0")
 bazel_dep(name = "protobuf", version = "33.1", repo_name = "com_google_protobuf")
 bazel_dep(name = "protoc-gen-validate", version = "1.2.1.bcr.2", repo_name = "com_envoyproxy_protoc_gen_validate")
-bazel_dep(name = "re2", version = "2024-07-02.bcr.1", repo_name = "com_googlesource_code_re2")
+bazel_dep(name = "re2", version = "2024-07-02.bcr.1")
 bazel_dep(name = "rules_cc", version = "0.2.14")
 bazel_dep(name = "rules_go", version = "0.59.0", repo_name = "io_bazel_rules_go")
 bazel_dep(name = "rules_java", version = "9.0.3")
 bazel_dep(name = "rules_jvm_external", version = "6.8")
 bazel_dep(name = "rules_proto", version = "7.1.0")
 bazel_dep(name = "rules_python", version = "1.6.0")
 bazel_dep(name = "xds", version = "0.0.0-20240423-555b57e")
-bazel_dep(name = "zipkin-api", version = "1.0.0", repo_name = "com_github_openzipkin_zipkinapi")
-
-# Bump google_benchmark to avoid rules_foreign_cc
-bazel_dep(name = "google_benchmark", version = "1.9.2")
+bazel_dep(name = "zipkin-api", version = "1.0.0")
 
 # Test dependencies from Bazel Central Registry
-bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True, repo_name = "com_google_googletest")
+bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True)
 
 # Go SDK and toolchain configuration
 go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")

api/bazel/cc_proto_descriptor_library/BUILD

@@ -8,7 +8,7 @@ cc_library(
     hdrs = ["file_descriptor_info.h"],
     visibility = ["//visibility:public"],
     deps = [
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/strings",
     ],
 )
 
@@ -24,9 +24,9 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":file_descriptor_info",
-        "@com_google_absl//absl/memory",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:str_format",
+        "@abseil-cpp//absl/memory",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/strings:str_format",
         "@com_google_protobuf//:protobuf",
     ],
 )
@@ -36,8 +36,8 @@ cc_library(
     srcs = ["file_descriptor_generator.cc"],
     hdrs = ["file_descriptor_generator.h"],
     deps = [
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:str_format",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/strings:str_format",
         "@com_google_protobuf//:protobuf",
         "@com_google_protobuf//src/google/protobuf/compiler:code_generator",
     ],
@@ -62,9 +62,9 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":text_format_transcoder",
-        "@com_google_absl//absl/memory",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:str_format",
+        "@abseil-cpp//absl/memory",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/strings:str_format",
         "@com_google_protobuf//:protobuf",
     ],
 )

api/bazel/cc_proto_descriptor_library/builddefs.bzl

@@ -323,7 +323,7 @@ cc_proto_descriptor_library_aspect = aspect(
         "_descriptor": attr.label_list(
             default = [
                 Label("//bazel/cc_proto_descriptor_library:file_descriptor_info"),
-                Label("@com_google_absl//absl/base:core_headers"),
+                Label("@abseil-cpp//absl/base:core_headers"),
             ],
         ),
     }),

api/bazel/cc_proto_descriptor_library/testdata/BUILD

@@ -102,8 +102,8 @@ cc_test(
         "test_extension_cc_proto",
         "test_extension_descriptors",
         "//bazel/cc_proto_descriptor_library:text_format_transcoder",
-        "@com_google_googletest//:gtest_main",
         "@com_google_protobuf//:protobuf",
+        "@googletest//:gtest_main",
     ],
 )
 
@@ -116,8 +116,8 @@ cc_test(
     deps = [
         "test_cc_proto",
         "//bazel/cc_proto_descriptor_library:text_format_transcoder",
-        "@com_google_googletest//:gtest_main",
         "@com_google_protobuf//:protobuf",
+        "@googletest//:gtest_main",
     ],
 )
 
@@ -132,7 +132,7 @@ cc_test(
         "test_descriptors",
         "//bazel/cc_proto_descriptor_library:create_dynamic_message",
         "//bazel/cc_proto_descriptor_library:text_format_transcoder",
-        "@com_google_googletest//:gtest_main",
         "@com_google_protobuf//:protobuf",
+        "@googletest//:gtest_main",
     ],
 )

api/bazel/deps.yaml

@@ -42,7 +42,7 @@ xds:
   - api
   license: "Apache-2.0"
   license_url: "https://github.com/cncf/xds/blob/{version}/LICENSE"
-com_github_openzipkin_zipkinapi:
+zipkin_api:
   project_name: "Zipkin API"
   project_desc: "Zipkin's language independent model and HTTP Api Definitions"
   project_url: "https://github.com/openzipkin/zipkin-api"

api/bazel/external_proto_deps.bzl

@@ -12,7 +12,7 @@ EXTERNAL_PROTO_IMPORT_BAZEL_DEP_MAP = {
     "google/api/expr/v1alpha1/checked.proto": "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto",
     "google/api/expr/v1alpha1/syntax.proto": "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto",
     "io/prometheus/client/metrics.proto": "@prometheus_metrics_model//:client_model",
-    "opentelemetry/proto/common/v1/common.proto": "@opentelemetry_proto//:common_proto",
+    "opentelemetry/proto/common/v1/common.proto": "@opentelemetry-proto//:common_proto",
 }
 
 # This maps from the Bazel proto_library target to the Go language binding target for external dependencies.
@@ -28,24 +28,24 @@ EXTERNAL_PROTO_GO_BAZEL_DEP_MAP = {
     #    go_googleapis in https://github.com/bazelbuild/rules_go/blob/master/go/dependencies.rst#overriding-dependencies
     "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto": "@org_golang_google_genproto_googleapis_api//expr/v1alpha1",
     "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@org_golang_google_genproto_googleapis_api//expr/v1alpha1",
-    "@opentelemetry_proto//:trace_proto": "@opentelemetry_proto//:trace_proto_go",
-    "@opentelemetry_proto//:trace_service_proto": "@opentelemetry_proto//:trace_service_grpc_go",
-    "@opentelemetry_proto//:logs_proto": "@opentelemetry_proto//:logs_proto_go",
-    "@opentelemetry_proto//:logs_service_proto": "@opentelemetry_proto//:logs_service_grpc_go",
-    "@opentelemetry_proto//:metrics_proto": "@opentelemetry_proto//:metrics_proto_go",
-    "@opentelemetry_proto//:metrics_service_proto": "@opentelemetry_proto//:metrics_service_grpc_go",
-    "@opentelemetry_proto//:common_proto": "@opentelemetry_proto//:common_proto_go",
+    "@opentelemetry-proto//:trace_proto": "@opentelemetry-proto//:trace_proto_go",
+    "@opentelemetry-proto//:trace_service_proto": "@opentelemetry-proto//:trace_service_grpc_go",
+    "@opentelemetry-proto//:logs_proto": "@opentelemetry-proto//:logs_proto_go",
+    "@opentelemetry-proto//:logs_service_proto": "@opentelemetry-proto//:logs_service_grpc_go",
+    "@opentelemetry-proto//:metrics_proto": "@opentelemetry-proto//:metrics_proto_go",
+    "@opentelemetry-proto//:metrics_service_proto": "@opentelemetry-proto//:metrics_service_grpc_go",
+    "@opentelemetry-proto//:common_proto": "@opentelemetry-proto//:common_proto_go",
 }
 
 # This maps from the Bazel proto_library target to the C++ language binding target for external dependencies.
 EXTERNAL_PROTO_CC_BAZEL_DEP_MAP = {
     "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto": "@com_google_googleapis//google/api/expr/v1alpha1:checked_cc_proto",
     "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto",
-    "@opentelemetry_proto//:trace_proto": "@opentelemetry_proto//:trace_proto_cc",
-    "@opentelemetry_proto//:trace_service_proto": "@opentelemetry_proto//:trace_service_grpc_cc",
-    "@opentelemetry_proto//:logs_proto": "@opentelemetry_proto//:logs_proto_cc",
-    "@opentelemetry_proto//:logs_service_proto": "@opentelemetry_proto//:logs_service_grpc_cc",
-    "@opentelemetry_proto//:metrics_proto": "@opentelemetry_proto//:metrics_proto_cc",
-    "@opentelemetry_proto//:metrics_service_proto": "@opentelemetry_proto//:metrics_service_grpc_cc",
-    "@opentelemetry_proto//:common_proto": "@opentelemetry_proto//:common_proto_cc",
+    "@opentelemetry-proto//:trace_proto": "@opentelemetry-proto//:trace_proto_cc",
+    "@opentelemetry-proto//:trace_service_proto": "@opentelemetry-proto//:trace_service_grpc_cc",
+    "@opentelemetry-proto//:logs_proto": "@opentelemetry-proto//:logs_proto_cc",
+    "@opentelemetry-proto//:logs_service_proto": "@opentelemetry-proto//:logs_service_grpc_cc",
+    "@opentelemetry-proto//:metrics_proto": "@opentelemetry-proto//:metrics_proto_cc",
+    "@opentelemetry-proto//:metrics_service_proto": "@opentelemetry-proto//:metrics_service_grpc_cc",
+    "@opentelemetry-proto//:common_proto": "@opentelemetry-proto//:common_proto_cc",
 }

api/bazel/repositories.bzl

@@ -37,6 +37,9 @@ def api_dependencies(bzlmod = False):
     )
     external_http_archive(
         name = "com_envoyproxy_protoc_gen_validate",
+        patch_args = ["-p1"],
+        patches = ["@envoy//bazel:pgv.patch"],
+        repo_mapping = {"@com_google_absl": "@abseil-cpp"},
     )
     external_http_archive(
         name = "com_google_googleapis",
@@ -51,15 +54,19 @@ def api_dependencies(bzlmod = False):
         name = "rules_proto",
     )
     external_http_archive(
-        name = "com_github_openzipkin_zipkinapi",
+        name = "zipkin-api",
+        location_name = "zipkin_api",
         build_file_content = ZIPKINAPI_BUILD_CONTENT,
     )
     external_http_archive(
-        name = "opentelemetry_proto",
+        name = "opentelemetry-proto",
+        location_name = "opentelemetry_proto",
         build_file_content = OPENTELEMETRY_BUILD_CONTENT,
+        repo_mapping = {"@com_google_absl": "@abseil-cpp"},
     )
     external_http_archive(
         name = "dev_cel",
+        repo_mapping = {"@com_google_absl": "@abseil-cpp"},
     )
 
 PROMETHEUSMETRICS_BUILD_CONTENT = """
@@ -93,14 +100,19 @@ api_cc_py_proto_library(
         "zipkin-jsonv2.proto",
         "zipkin.proto",
     ],
-    visibility = ["//visibility:public"],
 )
 
 go_proto_library(
     name = "zipkin_go_proto",
     proto = ":zipkin",
     visibility = ["//visibility:public"],
 )
+
+alias(
+    name = "zipkin-api",
+    actual = ":zipkin_cc_proto",
+    visibility = ["//visibility:public"],
+)
 """
 
 # Aligned target names with https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/opentelemetry-proto

api/bazel/repository_locations.bzl

@@ -24,7 +24,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         strip_prefix = "xds-{version}",
         urls = ["https://github.com/cncf/xds/archive/{version}.tar.gz"],
     ),
-    com_github_openzipkin_zipkinapi = dict(
+    zipkin_api = dict(
         version = "1.0.0",
         sha256 = "6c8ee2014cf0746ba452e5f2c01f038df60e85eb2d910b226f9aa27ddc0e44cf",
         strip_prefix = "zipkin-api-{version}",

api/envoy/extensions/access_loggers/open_telemetry/v3/BUILD

@@ -10,7 +10,7 @@ api_proto_package(
         "//envoy/config/core/v3:pkg",
         "//envoy/extensions/access_loggers/grpc/v3:pkg",
         "//envoy/type/tracing/v3:pkg",
-        "@opentelemetry_proto//:common_proto",
+        "@opentelemetry-proto//:common_proto",
         "@xds//udpa/annotations:pkg",
     ],
 )

api/envoy/extensions/stat_sinks/open_telemetry/v3/BUILD

@@ -7,7 +7,7 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@opentelemetry_proto//:common_proto",
+        "@opentelemetry-proto//:common_proto",
         "@xds//udpa/annotations:pkg",
         "@xds//xds/type/matcher/v3:pkg",
     ],

bazel/BUILD

@@ -994,9 +994,9 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = selects.with_or({
         ("//bazel:linux_x86_64", "//bazel:linux_aarch64"): [
-            "@com_github_google_tcmalloc//tcmalloc",
-            "@com_github_google_tcmalloc//tcmalloc:profile_marshaler",
-            "@com_github_google_tcmalloc//tcmalloc:malloc_extension",
+            "@tcmalloc//tcmalloc",
+            "@tcmalloc//tcmalloc:profile_marshaler",
+            "@tcmalloc//tcmalloc:malloc_extension",
         ],
         "//conditions:default": ["//bazel/external:gperftools"],
     }),
@@ -1009,7 +1009,7 @@ cc_library(
         (
             "//bazel:linux_x86_64",
             "//bazel:linux_aarch64",
-        ): ["@com_github_google_tcmalloc//tcmalloc"],
+        ): ["@tcmalloc//tcmalloc"],
         "//conditions:default": ["//bazel/external:gperftools"],
     }),
 )

bazel/dependency_imports.bzl

@@ -2,9 +2,8 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "register_jq_toolchains", "regis
 load("@base_pip3//:requirements.bzl", pip_dependencies = "install_deps")
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
 load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies")
-load("@com_github_aignas_rules_shellcheck//:deps.bzl", "shellcheck_dependencies")
+load("@cel-cpp//bazel:deps.bzl", "parser_deps")
 load("@com_github_chrusty_protoc_gen_jsonschema//:deps.bzl", protoc_gen_jsonschema_go_dependencies = "go_dependencies")
-load("@com_google_cel_cpp//bazel:deps.bzl", "parser_deps")
 load("@dev_pip3//:requirements.bzl", pip_dev_dependencies = "install_deps")
 load("@emsdk//:emscripten_deps.bzl", "emscripten_deps")
 load("@emsdk//:toolchains.bzl", "register_emscripten_toolchains")
@@ -23,6 +22,7 @@ load("@rules_rust//crate_universe:defs.bzl", "crates_repository")
 load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies")
 load("@rules_rust//rust:defs.bzl", "rust_common")
 load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains", "rust_repository_set")
+load("@shellcheck//:deps.bzl", "shellcheck_dependencies")
 
 # go version for rules_go
 GO_VERSION = "1.24.6"
@@ -140,7 +140,7 @@ def envoy_dependency_imports(
         build_external = "external",
     )
     go_repository(
-        name = "com_github_cncf_xds_go",
+        name = "xds_go",
         importpath = "github.com/cncf/xds/go",
         sum = "h1:gt7U1Igw0xbJdyaCM5H2CnlAlPSkzrhsebQB6WQWjLA=",
         version = "v0.0.0-20251110193048-8bfbf64dc13e",