Skip to content

Commit

Permalink
merged with latest from upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
dstanev-atvi committed Feb 24, 2024
1 parent ede8db4 commit 06dc80c
Show file tree
Hide file tree
Showing 4 changed files with 1,218 additions and 2,872 deletions.
2 changes: 1 addition & 1 deletion BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ config_setting(
)

# TODO: Version needs to be updated better here.
otel_sdk_prefix = "otel_sdk/" + "1.13.0" + "/"
otel_sdk_prefix = "otel_sdk/" + "1.14.1" + "/"

# Build configuration settings mimicking MSVC: debug=dbg, release=opt, reldeb=fastbuild
config_setting(
Expand Down
22 changes: 12 additions & 10 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,37 +1,39 @@
module(name="opentelemetry-cpp", version="1.13.0", repo_name="io_opentelemetry_cpp")

bazel_dep(name = "aspect_bazel_lib", version = "2.3.0")
bazel_dep(name = "rules_pkg", version = "0.9.1")
bazel_dep(name = "abseil-cpp", version = "20230802.1", repo_name="com_google_absl")
single_version_override(module_name = "abseil-cpp", version = "20230802.1")

bazel_dep(name = "aspect_bazel_lib", version = "2.4.2")
bazel_dep(name = "rules_pkg", version = "0.10.1")
bazel_dep(name = "rules_cc", version = "0.0.9", repo_name="rules_cc")
bazel_dep(name = "rules_go", version = "0.45.1", repo_name = "io_bazel_rules_go")
bazel_dep(name = "rules_go", version = "0.46.0", repo_name = "io_bazel_rules_go")

go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
go_sdk.download(version = "1.21.6")
go_sdk.download(version = "1.22.0")

# 23.1 has issues with
# bazel-out/x64_windows-fastbuild/bin/api/_virtual_includes/api\opentelemetry/nostd/./internal/absl/types/../utility/../base/internal/../../meta/type_traits.h(84,27): error: reference to 'is_trivially_destructible' is ambiguous
# 84 | absl::is_trivially_destructible<T>::value> {};
bazel_dep(name = "protobuf", version = "21.7" )

bazel_dep(name = "zlib", version = "1.3")
bazel_dep(name = "zlib", version = "1.3.1")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "platforms", version = "0.0.8")
bazel_dep(name = "google_benchmark", version = "1.8.3")
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
bazel_dep(name = "rules_python", version = "0.29.0")
bazel_dep(name = "rules_proto", version = "6.0.0-rc1")
bazel_dep(name = "rules_python", version = "0.31.0")
bazel_dep(name = "rules_proto", version = "6.0.0-rc2")

#
# bazel_dep(name = "abseil-cpp", version = "20240116.0")
# external/com_github_grpc_grpc/src/core/lib/iomgr/event_engine_shims/tcp_client.cc(74,23): error: no member named 'StrCat' in namespace 'absl'
# absl::StrCat("tcp-client:", addr_uri.value()))
bazel_dep(name = "abseil-cpp", version = "20230802.1", repo_name="com_google_absl")
bazel_dep(name = "rules_apple", version = "3.2.1", repo_name = "build_bazel_rules_apple")
bazel_dep(name = "rules_apple", version = "3.3.0", repo_name = "build_bazel_rules_apple")
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name="github_nlohmann_json")

#bazel_dep(name = "libpfm", version = "4.11.0")

bazel_dep(name = "re2", version = "2023-11-01")
bazel_dep(name = "re2", version = "2024-02-01")
#bazel_dep(name = "upb", version = "0.0.0-20220923-a547704")
bazel_dep(name = "c-ares", version = "1.16.1", repo_name="com_github_cares_cares")
#bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014", repo_name="boringssl")
Expand Down
Loading

0 comments on commit 06dc80c

Please sign in to comment.