Skip to content

Commit

Permalink
Add again the x folder, but as separate repo, trying to reuse main one
Browse files Browse the repository at this point in the history
  • Loading branch information
malkia committed Sep 4, 2024
1 parent 1154aef commit ff114ca
Show file tree
Hide file tree
Showing 8 changed files with 4,576 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ mod --lockfile_mode=update
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=//:x64_windows-clang-cl
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"
Expand Down
22 changes: 15 additions & 7 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ alias(

# Import the otel_sdk.dll, and the two exposed otel_sdk.lib and otel_sdk.pdb files as one target
[otel_cc_import(
name = otel_sdk_binary + "_dll", #"_import",
name = otel_sdk_binary + "_dll", #"_import",
data = select({
"@platforms//os:windows": [otel_sdk_binary + "_pdb_file"],
"//conditions:default": None,
Expand Down Expand Up @@ -323,12 +323,12 @@ pkg_files(
args = [
"debug-files",
"bundle-sources",
"$(location " + otel_sdk_binary + "_lib_file" + ")"
"$(location " + otel_sdk_binary + "_lib_file" + ")",
],
tags = [
"manual",
"manual",
# TODO - Fix this to work in the sandbox, by using sentry-cli's -o folder
"no-sandbox"
"no-sandbox",
],
tool = "@multitool//tools/sentry-cli",
) for otel_sdk_binary in [
Expand Down Expand Up @@ -388,12 +388,12 @@ pkg_files(
pkg_filegroup(
name = "otel_sdk_files",
srcs = [
"otel_sdk_header_files",
"otel_sdk_d_lib_files",
"otel_sdk_r_lib_files",
"otel_sdk_rd_lib_files",
"otel_sdk_d_src_bundle",
"otel_sdk_header_files",
"otel_sdk_r_lib_files",
"otel_sdk_r_src_bundle",
"otel_sdk_rd_lib_files",
"otel_sdk_rd_src_bundle",
],
)
Expand Down Expand Up @@ -469,3 +469,11 @@ platform(
"@bazel_tools//tools/cpp:clang-cl",
],
)

exports_files(
[
"dll_deps.bzl",
"dll_deps_generated_windows.bzl",
"dll_deps_generated_non_windows.bzl",
]
)
6 changes: 3 additions & 3 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module(
name = "opentelemetry-cpp",
name = "otel_sdk",
version = "1.16.1-dll",
)

Expand All @@ -15,7 +15,7 @@ bazel_dep(name = "grpc", version = "1.66.0.bcr.1", repo_name = "com_github_grpc_
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", dev_dependency = True)
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")
Expand All @@ -32,7 +32,7 @@ archive_override(
urls = "https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v1.3.2.tar.gz",
)

bazel_dep(name = "prometheus-cpp", version = "1.3.0")
bazel_dep(name = "prometheus-cpp", version = "1.2.4")
archive_override(
module_name = "prometheus-cpp",
integrity = "sha256-uElFYvmIrzXsElYbbrNS0Mvtfj99aKae2nhsZhCvxG4=",
Expand Down
7 changes: 6 additions & 1 deletion MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dll_deps.bzl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("dll_deps_generated_non_windows.bzl", dll_deps_non_windows = "DLL_DEPS")
load("dll_deps_generated_windows.bzl", dll_deps_windows = "DLL_DEPS")
load("@otel_sdk//:dll_deps_generated_non_windows.bzl", dll_deps_non_windows = "DLL_DEPS")
load("@otel_sdk//:dll_deps_generated_windows.bzl", dll_deps_windows = "DLL_DEPS")

def _absolute_label(label):
""" returns the absolute path to a label string """
Expand Down
1 change: 1 addition & 0 deletions x/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

9 changes: 9 additions & 0 deletions x/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module(name = "otel_sdk_x", version = "0.1")
bazel_dep(name = "curl", version = "8.8.0.bcr.1")
bazel_dep(name = "otel_sdk", version = "")
local_path_override(module_name = "otel_sdk", path = "..")

use_repo(
use_extension("@bazel_tools//tools/cpp:cc_configure.bzl", "cc_configure_extension"),
"local_config_cc",
)
Loading

0 comments on commit ff114ca

Please sign in to comment.