more cleanup

Author: malkia

.bazelrc

@@ -16,8 +16,6 @@ common --remote_download_minimal
 # Avoid using c:\windows\system32\bash.exe
 common:windows --shell_executable="c:\\program files\\git\\usr\\bin\\bash.exe"
 
-common --skip_incompatible_explicit_targets
-
 # Enable automatic configs based on platform
 common --enable_platform_specific_config
 common --enable_runfiles
@@ -89,20 +87,30 @@ mod --charset=ascii
 common --nobuild_runfile_links
 startup --windows_enable_symlinks
 
-# Ideally all of these should get uncommented for further bazel migrations
-# This list was taken from here https://github.com/bazelbuild/bazel/releases/tag/7.0.0
+# common --experimental_disable_external_package
 # common --incompatible_disable_starlark_host_transitions
+# common --incompatible_disable_target_default_provider_fields
+# common --incompatible_no_rule_outputs_param
 # common --incompatible_stop_exporting_language_modules
+# common --incompatible_use_host_features
+common --experimental_platforms_api
+common --experimental_repository_cache_hardlinks 
 common --incompatible_auto_exec_groups
 common --incompatible_config_setting_private_default_visibility
 common --incompatible_disable_native_repo_rules 
 common --incompatible_disable_non_executable_java_binary
-#common --incompatible_disable_target_default_provider_fields
 common --incompatible_disable_target_provider_fields
 common --incompatible_disallow_struct_provider_syntax
+common --incompatible_enable_proto_toolchain_resolution
+common --incompatible_fail_on_unknown_attributes
+common --incompatible_merge_fixed_and_default_shell_env
+common --incompatible_no_implicit_file_export
 common --incompatible_strict_action_env
-# common --incompatible_use_host_features
+common --incompatible_top_level_aspects_require_providers
+common --incompatible_use_cc_configure_from_rules_cc
+
 common --modify_execution_info=CppCompile=+supports-path-mapping
+common --skip_incompatible_explicit_targets
 
 build --@curl//:use_mbedtls=true 
 # build --@curl//:http_only=true
@@ -120,13 +128,6 @@ 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"
 
-# LLVM 19.1.0
-# opentelemetry/logs/logger.h(76,89): 
-#    error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw]
-#  detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set( 
-#                                                                                  ^
-#build:clang-cl --copt=-Wno-missing-template-arg-list-after-template-kw
-
 # allow newer protobuf to compile
 common --experimental_google_legacy_api
 common --experimental_enable_android_migration_apis
@@ -135,22 +136,9 @@ common:linux --force_pic
 common:macos --force_pic
 
 startup --client_debug
-common --experimental_repository_cache_hardlinks 
-common --incompatible_enable_proto_toolchain_resolution
-#common --experimental_disable_external_package
-common --experimental_platforms_api
-common --incompatible_fail_on_unknown_attributes
-common --incompatible_merge_fixed_and_default_shell_env
-common --incompatible_no_implicit_file_export
-#common --incompatible_no_rule_outputs_param
-#common --incompatible_stop_exporting_language_modules
-common --incompatible_top_level_aspects_require_providers
-common --incompatible_use_cc_configure_from_rules_cc
 
 ## This is what my ../top.bazelrc contains (not in the repo as local to my machine)
 # build --disk_cache=f:/b/d
 # common --repository_cache=f:/b/r
 # startup --output_user_root=f:/b/u
 try-import %workspace%/../top.bazelrc
-
-

MODULE.bazel

@@ -31,7 +31,7 @@ single_version_override(
 
 bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1")
 bazel_dep(name = "platforms", version = "0.0.10")
-bazel_dep(name = "rules_cc", version = "0.0.17")
+bazel_dep(name = "rules_cc", version = "0.1.0")
 single_version_override(
     module_name = "rules_cc", version = "0.0.17"
 )
@@ -40,6 +40,7 @@ bazel_dep(name = "rules_proto", version = "7.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 = "1.0.0")
+bazel_dep(name = "protoc-gen-validate", version = "1.0.4.bcr.1")
 
 bazel_dep(name = "c-ares", version = "1.16.1")
 archive_override(

bazel/opentelemetry-proto.patch

@@ -3,12 +3,11 @@ new file mode 100644
 index 0000000..07d6a90
 --- /dev/null
 +++ b/BUILD.bazel
-@@ -0,0 +1,151 @@
+@@ -0,0 +1,150 @@
 +# Copyright The OpenTelemetry Authors
 +# SPDX-License-Identifier: Apache-2.0
 +
 +load("@grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
-+load("@rules_proto//proto:defs.bzl", "proto_library")
 +
 +package(default_visibility = ["//visibility:public"])
 +
@@ -160,12 +159,11 @@ new file mode 100644
 index 0000000..a5a5e54
 --- /dev/null
 +++ b/MODULE.bazel
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,7 @@
 +module(
 +    name = "opentelemetry-proto",
 +    version = "1.4.0",
 +    compatibility_level = 0,
 +)
 +
 +bazel_dep(name = "grpc", version = "1.68.0")
-+bazel_dep(name = "rules_proto", version = "6.0.2")

x/bazel/opentelemetry-proto.patch

@@ -3,12 +3,11 @@ new file mode 100644
 index 0000000..07d6a90
 --- /dev/null
 +++ b/BUILD.bazel
-@@ -0,0 +1,151 @@
+@@ -0,0 +1,150 @@
 +# Copyright The OpenTelemetry Authors
 +# SPDX-License-Identifier: Apache-2.0
 +
 +load("@grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
-+load("@rules_proto//proto:defs.bzl", "proto_library")
 +
 +package(default_visibility = ["//visibility:public"])
 +
@@ -160,12 +159,11 @@ new file mode 100644
 index 0000000..a5a5e54
 --- /dev/null
 +++ b/MODULE.bazel
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,7 @@
 +module(
 +    name = "opentelemetry-proto",
 +    version = "1.4.0",
 +    compatibility_level = 0,
 +)
 +
 +bazel_dep(name = "grpc", version = "1.68.0")
-+bazel_dep(name = "rules_proto", version = "6.0.2")

x/x.cpp

@@ -450,7 +450,7 @@ int main1()
   //pA.proxy->SetActive( false );
 
   printf("starting...\n");
-  proxy_thread proxy("127.0.0.1:43170", opentelemetry::exporter::otlp::GetOtlpDefaultGrpcEndpoint());
+  //proxy_thread proxy("127.0.0.1:43170", opentelemetry::exporter::otlp::GetOtlpDefaultGrpcEndpoint());
 //  proxy.proxy->SetActive(false);
   printf("started...\n");