changes...

Author: malkia

.bazelrc

@@ -108,25 +108,25 @@ common --incompatible_disable_target_provider_fields
 common --incompatible_struct_has_no_methods
 common --incompatible_config_setting_private_default_visibility
 # common --incompatible_stop_exporting_language_modules
-# common --incompatible_disallow_empty_glob
+common --incompatible_disallow_empty_glob
 # common --incompatible_disable_starlark_host_transitions
 
 build --nolegacy_important_outputs
 
 build --@curl//:use_mbedtls=true 
 # build --@curl//:http_only=true
 
-mod --lockfile_mode=update
+mod --lockfile_mode=refresh
 
 # Select clang-cl to be the default compiler on Windows
 build:windows --config=clang-cl
 
 # See MODULE.bazel where we've disabled the platform/toolchain setup, but made it back here
 build:clang-cl --host_platform=@otel_sdk//:x64_windows-clang-cl
 build:clang-cl --extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl
-build:clang-cl --per_file_copt="external/protobuf\\+/.*@-Wno-invalid-offsetof"
-build:clang-cl --host_per_file_copt="external/protobuf\\+/.*@-Wno-invalid-offsetof"
-build:clang-cl --per_file_copt="external/c-ares\\+/.*@-Wno-macro-redefined"
-build:clang-cl --host_per_file_copt="external/c-ares\\+/.*@-Wno-macro-redefined"
+build:clang-cl --per_file_copt="protobuf\\+/.*@-Wno-invalid-offsetof"
+build:clang-cl --host_per_file_copt="protobuf\\+/.*@-Wno-invalid-offsetof"
+build:clang-cl --per_file_copt="c-ares\\+/.*@-Wno-macro-redefined"
+build:clang-cl --host_per_file_copt="c-ares\\+/.*@-Wno-macro-redefined"
 
 build --incompatible_strict_action_env

MODULE.bazel

@@ -14,11 +14,12 @@ bazel_dep(name = "googletest", version = "1.15.2")  #, dev_dependency = True)
 bazel_dep(name = "grpc", version = "1.66.0.bcr.2")  #, repo_name = "com_github_grpc_grpc")
 single_version_override(
     module_name = "grpc",
+    patch_strip = 1,
     # https://github.com/grpc/grpc/pull/37534
     # https://github.com/grpc/grpc/pull/37534.diff
     patches = ["bazel/grpc_bzlmod.diff"],
-    patch_strip = 1,
 )
+
 bazel_dep(name = "nlohmann_json", version = "3.11.3")
 bazel_dep(name = "platforms", version = "0.0.10")
 bazel_dep(name = "rules_cc", version = "0.0.10")
@@ -58,6 +59,17 @@ use_repo(
     "local_config_cc",
 )
 
+# This is needed only for most of the `bazel mod xxx` functions to work.
+#
+# Otherwise it complaints with
+#
+# ERROR: in tag at https://bcr.bazel.build/modules/grpc-java/1.62.2/MODULE.bazel:89:15: no repository visible as
+#        '@com_google_protobuf_javalite' to the repository '@@grpc-java+', but referenced by label
+#        '@com_google_protobuf_javalite//:protobuf_javalite' in attribute 'target' of tag 'override'.
+#      Is the module 'grpc-java' missing a bazel_dep or use_repo(..., "com_google_protobuf_javalite")?.
+#
+bazel_dep(name = "grpc-java", version = "1.64.0")
+
 multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
 multitool.hub(lockfile = "@otel_sdk//:multitool.lock.json")
 use_repo(multitool, "multitool")

otel_sdk_build.cmd

@@ -25,15 +25,15 @@ goto:eof
 
 :test
 REM singleton_test does not work when linked as static under Windows
-"%__BAZEL__%" test --profile=0.nodll.tracing.json --//:with_dll=false -- ... -//api/test/singleton:singleton_test || goto:error
-"%__BAZEL__%" build --profile=1.all.tracing.json --//:with_dll=true -- ... -otel_sdk_zip || goto:error
-"%__BAZEL__%" test --profile=2.dbg.tracing.json --//:with_dll=true -c dbg -- ... -otel_sdk_zip || goto:error
-"%__BAZEL__%" test --profile=3.fastbuild.tracing.json --//:with_dll=true -c fastbuild -- ... -otel_sdk_zip || goto:error
-"%__BAZEL__%" test --profile=4.opt.tracing.json --//:with_dll=true -c opt -- ... -otel_sdk_zip || goto:error
+"%__BAZEL__%" test  -k --profile=0.nodll.tracing.json --//:with_dll=false -- ... -//api/test/singleton:singleton_test || echo goto:error
+"%__BAZEL__%" build -k --profile=1.all.tracing.json --//:with_dll=true -- ... -otel_sdk_zip || echo goto:error
+"%__BAZEL__%" test  -k --profile=2.dbg.tracing.json --//:with_dll=true -c dbg -- ... -otel_sdk_zip || echo goto:error
+"%__BAZEL__%" test  -k --profile=3.fastbuild.tracing.json --//:with_dll=true -c fastbuild -- ... -otel_sdk_zip || echo goto:error
+"%__BAZEL__%" test  -k --profile=4.opt.tracing.json --//:with_dll=true -c opt -- ... -otel_sdk_zip || echo goto:error
 goto:eof
 
 :zip
-"%__BAZEL__%" run --profile=5.pkg.tracing.json --//:with_dll=true make_otel_sdk || goto:error
+"%__BAZEL__%" run --profile=5.pkg.tracing.json --//:with_dll=true make_otel_sdk || echo goto:error
 goto:eof
 
 :shutdown

x/.bazelrc

@@ -1,3 +1,2 @@
-build --@otel_sdk//:with_dll
 import %workspace%/../.bazelrc
 try-import %workspace%/../../top.bazelrc

x/MODULE.bazel

@@ -1,9 +1,75 @@
-module(name = "otel_sdk_x", version = "0.1")
-bazel_dep(name = "curl", version = "8.8.0.bcr.1")
+module(
+    name = "otel_sdk_x",
+    version = "0.1",
+)
+
 bazel_dep(name = "otel_sdk", version = "")
-local_path_override(module_name = "otel_sdk", path = "..")
+local_path_override(
+    module_name = "otel_sdk",
+    path = "..",
+)
+
+## Almost copied verbatim from ../MODULE.bazel
+
+bazel_dep(name = "abseil-cpp", version = "20240722.0")
+
+#bazel_dep(name = "aspect_bazel_lib", version = "2.8.1")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "boringssl", version = "0.0.0-20240530-2db0eb3")
+bazel_dep(name = "curl", version = "8.8.0.bcr.1")
+
+#bazel_dep(name = "depend_on_what_you_use", version = "0.4.0")
+bazel_dep(name = "google_benchmark", version = "1.8.5")  #, dev_dependency = True)
+bazel_dep(name = "googletest", version = "1.15.2")  #, dev_dependency = True)
+bazel_dep(name = "grpc", version = "1.66.0.bcr.1")  #, repo_name = "com_github_grpc_grpc")
+single_version_override(
+    module_name = "grpc",
+    patch_strip = 1,
+    # https://github.com/grpc/grpc/pull/37534
+    # https://github.com/grpc/grpc/pull/37534.diff
+    patches = ["bazel/grpc_bzlmod.diff"],
+)
+
+bazel_dep(name = "nlohmann_json", version = "3.11.3")
+bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "rules_cc", version = "0.0.9")
+bazel_dep(name = "rules_pkg", version = "1.0.1")
+bazel_dep(name = "rules_proto", version = "6.0.2")
+bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
+
+#bazel_dep(name = "opentracing-cpp", version = "1.6.0")
+bazel_dep(name = "rules_multitool", version = "0.12.0")
+bazel_dep(name = "opentelemetry-proto", version = "1.3.2")
+archive_override(
+    module_name = "opentelemetry-proto",
+    integrity = "sha256-wGnA2WE3zwBdNEEfpn3TtvH4xkrx5/sv4AiaQcQlrNc=",
+    patch_strip = 1,
+    # Copied from https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/opentelemetry-proto/1.3.1/patches
+    patches = ["bazel/opentelemetry-proto.patch"],
+    strip_prefix = "opentelemetry-proto-1.3.2",
+    urls = "https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v1.3.2.tar.gz",
+)
+
+bazel_dep(name = "prometheus-cpp", version = "1.2.4")
+archive_override(
+    module_name = "prometheus-cpp",
+    integrity = "sha256-uElFYvmIrzXsElYbbrNS0Mvtfj99aKae2nhsZhCvxG4=",
+    strip_prefix = "prometheus-cpp-6492e820cdff7e7345d46d82b43735aaea542098",
+    urls = "https://github.com/jupp0r/prometheus-cpp/archive/6492e820cdff7e7345d46d82b43735aaea542098.zip",
+)
 
 use_repo(
     use_extension("@bazel_tools//tools/cpp:cc_configure.bzl", "cc_configure_extension"),
     "local_config_cc",
 )
+
+# This is needed only for most of the `bazel mod xxx` functions to work.
+#
+# Otherwise it complaints with
+#
+# ERROR: in tag at https://bcr.bazel.build/modules/grpc-java/1.62.2/MODULE.bazel:89:15: no repository visible as
+#        '@com_google_protobuf_javalite' to the repository '@@grpc-java+', but referenced by label
+#        '@com_google_protobuf_javalite//:protobuf_javalite' in attribute 'target' of tag 'override'.
+#      Is the module 'grpc-java' missing a bazel_dep or use_repo(..., "com_google_protobuf_javalite")?.
+#
+bazel_dep(name = "grpc-java", version = "1.64.0")