Skip to content

Commit 9ad4aee

Browse files
committed
updated bzlmods. Addedn an integration example in the x folder
1 parent a0e66a1 commit 9ad4aee

File tree

9 files changed

+372
-69
lines changed

9 files changed

+372
-69
lines changed

MODULE.bazel

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ module(
44
)
55

66
bazel_dep(name = "abseil-cpp", version = "20240722.0")
7-
bazel_dep(name = "aspect_bazel_lib", version = "2.9.0")
7+
bazel_dep(name = "aspect_bazel_lib", version = "2.9.1")
88
bazel_dep(name = "bazel_skylib", version = "1.7.1")
99
bazel_dep(name = "boringssl", version = "0.20240913.0")
1010
bazel_dep(name = "curl", version = "8.8.0.bcr.1")
1111
bazel_dep(name = "depend_on_what_you_use", version = "0.5.0")
12-
bazel_dep(name = "google_benchmark", version = "1.8.5") #, dev_dependency = True)
13-
bazel_dep(name = "googletest", version = "1.15.2") #, dev_dependency = True)
14-
bazel_dep(name = "grpc", version = "1.66.0.bcr.2") #, repo_name = "com_github_grpc_grpc")
12+
bazel_dep(name = "google_benchmark", version = "1.8.5")
13+
bazel_dep(name = "googletest", version = "1.15.2")
14+
bazel_dep(name = "grpc", version = "1.66.0.bcr.2")
1515
single_version_override(
1616
module_name = "grpc",
1717
patch_strip = 1,
@@ -34,7 +34,6 @@ bazel_dep(name = "rules_multitool", version = "0.12.0")
3434
# 'bazel-out/x64_windows-opt-exec-ST-d610928244b0/bin/external/protobuf+/src/google/protobuf/_virtual_includes/protobuf_lite/google/protobuf/port.h'
3535
#bazel_dep(name = "protobuf", version = "28.2")
3636
bazel_dep(name = "protobuf", version = "26.0.bcr.2")
37-
3837
bazel_dep(name = "opentelemetry-proto", version = "1.3.2")
3938
archive_override(
4039
module_name = "opentelemetry-proto",
@@ -68,7 +67,7 @@ use_repo(
6867
# '@com_google_protobuf_javalite//:protobuf_javalite' in attribute 'target' of tag 'override'.
6968
# Is the module 'grpc-java' missing a bazel_dep or use_repo(..., "com_google_protobuf_javalite")?.
7069
#
71-
bazel_dep(name = "grpc-java", version = "1.64.0")
70+
bazel_dep(name = "grpc-java", version = "1.66.0")
7271

7372
multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
7473
multitool.hub(lockfile = "@otel_sdk//:multitool.lock.json")

multitool.lock.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,36 @@
44
"binaries": [
55
{
66
"kind": "file",
7-
"url": "https://github.com/getsentry/sentry-cli/releases/download/2.35.0/sentry-cli-Linux-aarch64",
8-
"sha256": "36cf2f21865bd28cb7b673dfeedf0982757a5375b8e702418706c859b91adee8",
7+
"url": "https://github.com/getsentry/sentry-cli/releases/download/2.36.3/sentry-cli-Linux-aarch64",
8+
"sha256": "fbafab83e3f1b5dc9ef733524957a4c9fb3d5c607f2be0b11e9f031e36909cce",
99
"os": "linux",
1010
"cpu": "arm64"
1111
},
1212
{
1313
"kind": "file",
14-
"url": "https://github.com/getsentry/sentry-cli/releases/download/2.35.0/sentry-cli-Linux-x86_64",
15-
"sha256": "968b3b623867ab83c0163e8d8e9f21007e2f7dbaa248a8890798c9f4e098f69c",
14+
"url": "https://github.com/getsentry/sentry-cli/releases/download/2.36.3/sentry-cli-Linux-x86_64",
15+
"sha256": "f1cb3f3936230c20ae4ab20802614fa208063d6239f7d29e06abb0917a934118",
1616
"os": "linux",
1717
"cpu": "x86_64"
1818
},
1919
{
2020
"kind": "file",
21-
"url": "https://github.com/getsentry/sentry-cli/releases/download/2.35.0/sentry-cli-Darwin-arm64",
22-
"sha256": "77081405fff0587f0cc153c90857f7786f1137de027533dccdc9779400ada14f",
21+
"url": "https://github.com/getsentry/sentry-cli/releases/download/2.36.3/sentry-cli-Darwin-arm64",
22+
"sha256": "82a1478f623e7f5c54300d2f13c560841048a020591279bdf7469ee3647545af",
2323
"os": "macos",
2424
"cpu": "arm64"
2525
},
2626
{
2727
"kind": "file",
28-
"url": "https://github.com/getsentry/sentry-cli/releases/download/2.35.0/sentry-cli-Darwin-x86_64",
29-
"sha256": "85386eed7a464c64b13dba8d4012474c260b523676bb95b898aef28532a12376",
28+
"url": "https://github.com/getsentry/sentry-cli/releases/download/2.36.3/sentry-cli-Darwin-x86_64",
29+
"sha256": "48a999bd17d4888a6b41cf5062c9381907c6a8226d0f6c4b0b3dcd79247e1094",
3030
"os": "macos",
3131
"cpu": "x86_64"
3232
},
3333
{
3434
"kind": "file",
35-
"url": "https://github.com/getsentry/sentry-cli/releases/download/2.35.0/sentry-cli-Windows-x86_64.exe",
36-
"sha256": "2596622de6e6f4cb0580b3ce1341b4f62390231aea0c30fc127c991d379a6ac6",
35+
"url": "https://github.com/getsentry/sentry-cli/releases/download/2.36.3/sentry-cli-Windows-x86_64.exe",
36+
"sha256": "49bd3c20b693a4871e3340ec526cb826e716ee003aa2edea2fc11dc7aa4f58f2",
3737
"os": "windows",
3838
"cpu": "x86_64"
3939
}

otel_sdk_build.cmd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ goto:eof
2525

2626
:test
2727
REM singleton_test does not work when linked as static under Windows
28-
"%__BAZEL__%" test -k --profile=0.nodll.tracing.json --//:with_dll=false -- ... -//api/test/singleton:singleton_test || echo goto:error
29-
"%__BAZEL__%" build -k --profile=1.all.tracing.json --//:with_dll=true -- ... -otel_sdk_zip || echo goto:error
30-
"%__BAZEL__%" test -k --profile=2.dbg.tracing.json --//:with_dll=true -c dbg -- ... -otel_sdk_zip || echo goto:error
31-
"%__BAZEL__%" test -k --profile=3.fastbuild.tracing.json --//:with_dll=true -c fastbuild -- ... -otel_sdk_zip || echo goto:error
32-
"%__BAZEL__%" test -k --profile=4.opt.tracing.json --//:with_dll=true -c opt -- ... -otel_sdk_zip || echo goto:error
28+
"%__BAZEL__%" test --profile=0.nodll.tracing.json --//:with_dll=false -- ... -//api/test/singleton:singleton_test || echo goto:error
29+
"%__BAZEL__%" build --profile=1.all.tracing.json --//:with_dll=true -- ... -otel_sdk_zip || echo goto:error
30+
"%__BAZEL__%" test --profile=2.dbg.tracing.json --//:with_dll=true -c dbg -- ... -otel_sdk_zip || echo goto:error
31+
"%__BAZEL__%" test --profile=3.fastbuild.tracing.json --//:with_dll=true -c fastbuild -- ... -otel_sdk_zip || echo goto:error
32+
"%__BAZEL__%" test --profile=4.opt.tracing.json --//:with_dll=true -c opt -- ... -otel_sdk_zip || echo goto:error
3333
goto:eof
3434

3535
:zip

x/.bazelrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
import %workspace%/../.bazelrc
2+
build --@otel_sdk//:with_dll=true
23
try-import %workspace%/../../top.bazelrc

x/BUILD.bazel

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
1+
cc_binary(
2+
name = "x",
3+
srcs = ["x.cpp"],
4+
deps = ["@otel_sdk//:dll"]
5+
)

x/MODULE.bazel

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@ local_path_override(
1212
## Almost copied verbatim from ../MODULE.bazel
1313

1414
bazel_dep(name = "abseil-cpp", version = "20240722.0")
15-
16-
#bazel_dep(name = "aspect_bazel_lib", version = "2.8.1")
1715
bazel_dep(name = "bazel_skylib", version = "1.7.1")
18-
bazel_dep(name = "boringssl", version = "0.0.0-20240530-2db0eb3")
16+
bazel_dep(name = "boringssl", version = "0.20240913.0")
1917
bazel_dep(name = "curl", version = "8.8.0.bcr.1")
20-
21-
#bazel_dep(name = "depend_on_what_you_use", version = "0.4.0")
22-
bazel_dep(name = "google_benchmark", version = "1.8.5") #, dev_dependency = True)
23-
bazel_dep(name = "googletest", version = "1.15.2") #, dev_dependency = True)
24-
bazel_dep(name = "grpc", version = "1.66.0.bcr.1") #, repo_name = "com_github_grpc_grpc")
18+
bazel_dep(name = "google_benchmark", version = "1.8.5")
19+
bazel_dep(name = "googletest", version = "1.15.2")
20+
bazel_dep(name = "grpc", version = "1.66.0.bcr.2")
2521
single_version_override(
2622
module_name = "grpc",
2723
patch_strip = 1,
@@ -32,12 +28,11 @@ single_version_override(
3228

3329
bazel_dep(name = "nlohmann_json", version = "3.11.3")
3430
bazel_dep(name = "platforms", version = "0.0.10")
35-
bazel_dep(name = "rules_cc", version = "0.0.9")
31+
bazel_dep(name = "rules_cc", version = "0.0.10")
3632
bazel_dep(name = "rules_pkg", version = "1.0.1")
3733
bazel_dep(name = "rules_proto", version = "6.0.2")
3834
bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
3935

40-
#bazel_dep(name = "opentracing-cpp", version = "1.6.0")
4136
bazel_dep(name = "rules_multitool", version = "0.12.0")
4237
bazel_dep(name = "opentelemetry-proto", version = "1.3.2")
4338
archive_override(
@@ -72,4 +67,4 @@ use_repo(
7267
# '@com_google_protobuf_javalite//:protobuf_javalite' in attribute 'target' of tag 'override'.
7368
# Is the module 'grpc-java' missing a bazel_dep or use_repo(..., "com_google_protobuf_javalite")?.
7469
#
75-
bazel_dep(name = "grpc-java", version = "1.64.0")
70+
bazel_dep(name = "grpc-java", version = "1.66.0")

0 commit comments

Comments
 (0)