From fd72cce008dfde2f6b64354282abb25dce792650 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Fri, 12 Dec 2025 19:10:18 +0100 Subject: [PATCH] Update Bazel dependencies to latest stable versions and add Bazel 9 compatibility Signed-off-by: Matthieu MOREL --- .github/dependabot.yml | 8 ++ BUILD.bazel | 288 +++++++++++++++++++++-------------------- MODULE.bazel | 21 +-- WORKSPACE | 31 +++-- 4 files changed, 178 insertions(+), 170 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c272b36b..e9880dfc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,6 +5,14 @@ version: 2 updates: + - package-ecosystem: "bazel" + directory: "/" + schedule: + interval: "monthly" + groups: + bazel-packages: + patterns: + - "*" - package-ecosystem: "github-actions" directory: "/" schedule: diff --git a/BUILD.bazel b/BUILD.bazel index c305041f..5c5b72a5 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,152 +1,154 @@ +load("@rules_cc//cc:defs.bzl", "cc_library") + cc_library( name = "dd_trace_cpp", srcs = [ - "src/datadog/common/hash.cpp", - "src/datadog/telemetry/configuration.cpp", - "src/datadog/telemetry/log.h", - "src/datadog/telemetry/telemetry.cpp", - "src/datadog/telemetry/telemetry_impl.h", - "src/datadog/telemetry/telemetry_impl.cpp", - "src/datadog/telemetry/metric_context.h", - "src/datadog/baggage.cpp", - "src/datadog/base64.cpp", - "src/datadog/cerr_logger.cpp", - "src/datadog/clock.cpp", - "src/datadog/config_manager.cpp", - "src/datadog/collector_response.cpp", - "src/datadog/datadog_agent_config.cpp", - "src/datadog/datadog_agent.cpp", - "src/datadog/default_http_client_null.cpp", - "src/datadog/endpoint_inferral.cpp", - "src/datadog/environment.cpp", - "src/datadog/error.cpp", - "src/datadog/extraction_util.cpp", - "src/datadog/glob.cpp", - "src/datadog/http_client.cpp", - "src/datadog/id_generator.cpp", - "src/datadog/limiter.cpp", - "src/datadog/logger.cpp", - "src/datadog/msgpack.cpp", - "src/datadog/parse_util.cpp", - "src/datadog/propagation_style.cpp", - "src/datadog/random.cpp", - "src/datadog/rate.cpp", - "src/datadog/remote_config/remote_config.cpp", - "src/datadog/remote_config/product.cpp", - "src/datadog/runtime_id.cpp", - "src/datadog/span.cpp", - "src/datadog/span_data.cpp", - "src/datadog/span_matcher.cpp", - "src/datadog/span_sampler_config.cpp", - "src/datadog/span_sampler.cpp", - "src/datadog/string_util.cpp", - "src/datadog/tag_propagation.cpp", - "src/datadog/tags.cpp", - "src/datadog/trace_source.cpp", - "src/datadog/telemetry_metrics.cpp", - "src/datadog/threaded_event_scheduler.cpp", - "src/datadog/tracer_config.cpp", - "src/datadog/tracer.cpp", - "src/datadog/trace_id.cpp", - "src/datadog/trace_sampler_config.cpp", - "src/datadog/trace_sampler.cpp", - "src/datadog/trace_segment.cpp", - "src/datadog/version.cpp", - "src/datadog/w3c_propagation.cpp", - "src/datadog/common/hash.h", - "src/datadog/base64.h", - "src/datadog/config_manager.h", - "src/datadog/collector_response.h", - "src/datadog/datadog_agent.h", - "src/datadog/default_http_client.h", - "src/datadog/extracted_data.h", - "src/datadog/endpoint_inferral.h", - "src/datadog/extraction_util.h", - "src/datadog/glob.h", - "src/datadog/hex.h", - "src/datadog/json.hpp", - "src/datadog/json_serializer.h", - "src/datadog/limiter.h", - "src/datadog/msgpack.h", - "src/datadog/null_logger.h", - "src/datadog/parse_util.h", - "src/datadog/platform_util.h", - "src/datadog/random.h", - "src/datadog/remote_config/remote_config.h", - "src/datadog/sampling_util.h", - "src/datadog/span_data.h", - "src/datadog/span_sampler.h", - "src/datadog/string_util.h", - "src/datadog/tag_propagation.h", - "src/datadog/tags.h", - "src/datadog/telemetry_metrics.h", - "src/datadog/threaded_event_scheduler.h", - "src/datadog/trace_sampler.h", - "src/datadog/w3c_propagation.h", -] + select({ - "@platforms//os:windows": [ - "src/datadog/platform_util_windows.cpp", - ], - "@platforms//os:linux": [ - "src/datadog/platform_util_unix.cpp", - ], - "@platforms//os:macos": [ - "src/datadog/platform_util_darwin.cpp", - ], - "//conditions:default": [ - "src/datadog/platform_util_unknown.cpp", - ], -}), + "src/datadog/baggage.cpp", + "src/datadog/base64.cpp", + "src/datadog/base64.h", + "src/datadog/cerr_logger.cpp", + "src/datadog/clock.cpp", + "src/datadog/collector_response.cpp", + "src/datadog/collector_response.h", + "src/datadog/common/hash.cpp", + "src/datadog/common/hash.h", + "src/datadog/config_manager.cpp", + "src/datadog/config_manager.h", + "src/datadog/datadog_agent.cpp", + "src/datadog/datadog_agent.h", + "src/datadog/datadog_agent_config.cpp", + "src/datadog/default_http_client.h", + "src/datadog/default_http_client_null.cpp", + "src/datadog/endpoint_inferral.cpp", + "src/datadog/endpoint_inferral.h", + "src/datadog/environment.cpp", + "src/datadog/error.cpp", + "src/datadog/extracted_data.h", + "src/datadog/extraction_util.cpp", + "src/datadog/extraction_util.h", + "src/datadog/glob.cpp", + "src/datadog/glob.h", + "src/datadog/hex.h", + "src/datadog/http_client.cpp", + "src/datadog/id_generator.cpp", + "src/datadog/json.hpp", + "src/datadog/json_serializer.h", + "src/datadog/limiter.cpp", + "src/datadog/limiter.h", + "src/datadog/logger.cpp", + "src/datadog/msgpack.cpp", + "src/datadog/msgpack.h", + "src/datadog/null_logger.h", + "src/datadog/parse_util.cpp", + "src/datadog/parse_util.h", + "src/datadog/platform_util.h", + "src/datadog/propagation_style.cpp", + "src/datadog/random.cpp", + "src/datadog/random.h", + "src/datadog/rate.cpp", + "src/datadog/remote_config/product.cpp", + "src/datadog/remote_config/remote_config.cpp", + "src/datadog/remote_config/remote_config.h", + "src/datadog/runtime_id.cpp", + "src/datadog/sampling_util.h", + "src/datadog/span.cpp", + "src/datadog/span_data.cpp", + "src/datadog/span_data.h", + "src/datadog/span_matcher.cpp", + "src/datadog/span_sampler.cpp", + "src/datadog/span_sampler.h", + "src/datadog/span_sampler_config.cpp", + "src/datadog/string_util.cpp", + "src/datadog/string_util.h", + "src/datadog/tag_propagation.cpp", + "src/datadog/tag_propagation.h", + "src/datadog/tags.cpp", + "src/datadog/tags.h", + "src/datadog/telemetry/configuration.cpp", + "src/datadog/telemetry/log.h", + "src/datadog/telemetry/metric_context.h", + "src/datadog/telemetry/telemetry.cpp", + "src/datadog/telemetry/telemetry_impl.cpp", + "src/datadog/telemetry/telemetry_impl.h", + "src/datadog/telemetry_metrics.cpp", + "src/datadog/telemetry_metrics.h", + "src/datadog/threaded_event_scheduler.cpp", + "src/datadog/threaded_event_scheduler.h", + "src/datadog/trace_id.cpp", + "src/datadog/trace_sampler.cpp", + "src/datadog/trace_sampler.h", + "src/datadog/trace_sampler_config.cpp", + "src/datadog/trace_segment.cpp", + "src/datadog/trace_source.cpp", + "src/datadog/tracer.cpp", + "src/datadog/tracer_config.cpp", + "src/datadog/version.cpp", + "src/datadog/w3c_propagation.cpp", + "src/datadog/w3c_propagation.h", + ] + select({ + "@platforms//os:windows": [ + "src/datadog/platform_util_windows.cpp", + ], + "@platforms//os:linux": [ + "src/datadog/platform_util_unix.cpp", + ], + "@platforms//os:macos": [ + "src/datadog/platform_util_darwin.cpp", + ], + "//conditions:default": [ + "src/datadog/platform_util_unknown.cpp", + ], + }), hdrs = [ - "include/datadog/baggage.h", - "include/datadog/cerr_logger.h", - "include/datadog/clock.h", - "include/datadog/collector.h", - "include/datadog/config.h", - "include/datadog/datadog_agent_config.h", - "include/datadog/dict_reader.h", - "include/datadog/dict_writer.h", - "include/datadog/error.h", - "include/datadog/environment.h", - "include/datadog/event_scheduler.h", - "include/datadog/expected.h", - "include/datadog/http_client.h", - "include/datadog/http_endpoint_calculation_mode.h", - "include/datadog/id_generator.h", - "include/datadog/injection_options.h", - "include/datadog/logger.h", - "include/datadog/null_collector.h", - "include/datadog/optional.h", - "include/datadog/propagation_style.h", - "include/datadog/rate.h", - "include/datadog/runtime_id.h", - "include/datadog/sampling_decision.h", - "include/datadog/sampling_mechanism.h", - "include/datadog/sampling_priority.h", - "include/datadog/span.h", - "include/datadog/span_config.h", - "include/datadog/span_defaults.h", - "include/datadog/span_matcher.h", - "include/datadog/span_sampler_config.h", - "include/datadog/string_view.h", - "include/datadog/tracer.h", - "include/datadog/tracer_config.h", - "include/datadog/tracer_signature.h", - "include/datadog/trace_id.h", - "include/datadog/trace_source.h", - "include/datadog/trace_sampler_config.h", - "include/datadog/trace_segment.h", - "include/datadog/version.h", - "include/datadog/telemetry/configuration.h", - "include/datadog/telemetry/metrics.h", - "include/datadog/telemetry/telemetry.h", - "include/datadog/telemetry/product.h", - "include/datadog/remote_config/capability.h", - "include/datadog/remote_config/listener.h", - "include/datadog/remote_config/product.h", + "include/datadog/baggage.h", + "include/datadog/cerr_logger.h", + "include/datadog/clock.h", + "include/datadog/collector.h", + "include/datadog/config.h", + "include/datadog/datadog_agent_config.h", + "include/datadog/dict_reader.h", + "include/datadog/dict_writer.h", + "include/datadog/environment.h", + "include/datadog/error.h", + "include/datadog/event_scheduler.h", + "include/datadog/expected.h", + "include/datadog/http_client.h", + "include/datadog/http_endpoint_calculation_mode.h", + "include/datadog/id_generator.h", + "include/datadog/injection_options.h", + "include/datadog/logger.h", + "include/datadog/null_collector.h", + "include/datadog/optional.h", + "include/datadog/propagation_style.h", + "include/datadog/rate.h", + "include/datadog/remote_config/capability.h", + "include/datadog/remote_config/listener.h", + "include/datadog/remote_config/product.h", + "include/datadog/runtime_id.h", + "include/datadog/sampling_decision.h", + "include/datadog/sampling_mechanism.h", + "include/datadog/sampling_priority.h", + "include/datadog/span.h", + "include/datadog/span_config.h", + "include/datadog/span_defaults.h", + "include/datadog/span_matcher.h", + "include/datadog/span_sampler_config.h", + "include/datadog/string_view.h", + "include/datadog/telemetry/configuration.h", + "include/datadog/telemetry/metrics.h", + "include/datadog/telemetry/product.h", + "include/datadog/telemetry/telemetry.h", + "include/datadog/trace_id.h", + "include/datadog/trace_sampler_config.h", + "include/datadog/trace_segment.h", + "include/datadog/trace_source.h", + "include/datadog/tracer.h", + "include/datadog/tracer_config.h", + "include/datadog/tracer_signature.h", + "include/datadog/version.h", ], - strip_include_prefix = "include/", includes = ["src/datadog"], + strip_include_prefix = "include/", visibility = ["//visibility:public"], deps = [ "@com_google_absl//absl/strings", diff --git a/MODULE.bazel b/MODULE.bazel index 9ffed070..24337136 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -3,20 +3,7 @@ module( version = "2.0.1", ) -bazel_dep( - name = "platforms", - version = "0.0.11" -) -bazel_dep( - name = "bazel_skylib", - version = "1.2.1", -) -bazel_dep( - name = "rules_cc", - version = "0.0.9", -) -bazel_dep( - name = "abseil-cpp", - version = "20230125.1", - repo_name = "com_google_absl", -) +bazel_dep(name = "abseil-cpp", version = "20250814.1", repo_name = "com_google_absl") +bazel_dep(name = "bazel_skylib", version = "1.8.2") +bazel_dep(name = "platforms", version = "1.0.0") +bazel_dep(name = "rules_cc", version = "0.2.14") diff --git a/WORKSPACE b/WORKSPACE index 6ea78dd3..39f0fb10 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,20 +15,31 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( - name = "com_google_absl", - urls = ["https://github.com/abseil/abseil-cpp/archive/98eb410c93ad059f9bba1bf43f5bb916fc92a5ea.zip"], - sha256 = "aabf6c57e3834f8dc3873a927f37eaf69975d4b28117fc7427dfb1c661542a87", - strip_prefix = "abseil-cpp-98eb410c93ad059f9bba1bf43f5bb916fc92a5ea", + name = "com_google_absl", + sha256 = "1692f77d1739bacf3f94337188b78583cf09bab7e420d2dc6c5605a4f86785a1", + strip_prefix = "abseil-cpp-20250814.1", + urls = ["https://github.com/abseil/abseil-cpp/releases/download/20250814.1/abseil-cpp-20250814.1.tar.gz"], ) http_archive( - name = "bazel_skylib", - urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz"], - sha256 = "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728", + name = "bazel_skylib", + sha256 = "6e78f0e57de26801f6f564fa7c4a48dc8b36873e416257a92bbb0937eeac8446", + urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.8.2/bazel-skylib-1.8.2.tar.gz"], ) http_archive( - name = "platforms", - urls = ["https://github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz"], - sha256 = "8150406605389ececb6da07cbcb509d5637a3ab9a24bc69b1101531367d89d74", + name = "platforms", + sha256 = "3384eb1c30762704fbe38e440204e114154086c8fc8a8c2e3e28441028c019a8", + urls = ["https://github.com/bazelbuild/platforms/releases/download/1.0.0/platforms-1.0.0.tar.gz"], ) + +http_archive( + name = "rules_cc", + sha256 = "a2fdfde2ab9b2176bd6a33afca14458039023edb1dd2e73e6823810809df4027", + strip_prefix = "rules_cc-0.2.14", + urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.2.14/rules_cc-0.2.14.tar.gz"], +) + +load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo") + +compatibility_proxy_repo()