Skip to content

Commit 28291aa

Browse files
committed
2 parents 23e1e7d + 37fc3b5 commit 28291aa

File tree

10 files changed

+366
-58
lines changed

10 files changed

+366
-58
lines changed

.bazelrc

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,46 @@ build:macos --host_action_env=CC=/opt/homebrew/opt/llvm/bin/clang
6060

6161
# Windows specific asan setup
6262
# common:asanwin --copt -fsanitize=address,bool,float-cast-overflow,integer-divide-by-zero,null,return,returns-nonnull-attribute,shift-exponent,signed-integer-overflow,unreachable,vla-bound
63-
common:asanwin --copt -fsanitize=address,bool,float-cast-overflow,integer-divide-by-zero,null,return,returns-nonnull-attribute,shift-exponent,unreachable,vla-bound
64-
common:asanwin --copt -fsanitize-address-use-after-scope
65-
common:asanwin --copt -fno-sanitize-recover=all
63+
#common:asanwin --copt -fsanitize=address,bool,float-cast-overflow,integer-divide-by-zero,null,return,returns-nonnull-attribute,shift-exponent,unreachable,vla-bound
64+
# vptr is not support for "clang-cl"
65+
common:asanwin --copt -fsanitize=address,undefined,implicit-integer-truncation,implicit-integer-arithmetic-value-change,implicit-conversion,integer,nullability,float-divide-by-zero,local-bounds
6666
common:asanwin --copt -fno-sanitize-ignorelist --copt -MD
67-
common:asanwin --test_env=ASAN_OPTIONS=report_globals=0:detect_odr_violation=0
67+
#alignment,bool,builtin,bounds,array-bounds,enum,float-cast-overflow,integer-divide-by-zero,function,implicit-unsigned-integer-truncation,implicit-signed-integer-truncation,implicit-integer-sign-change,null,return,returns-nonnull-attribute,shift-exponent,unreachable,vla-bound
68+
common:asanwin --copt -fsanitize-address-use-after-scope
69+
common:asanwin --copt -fsanitize-address-globals-dead-stripping
70+
common:asanwin --copt -fsanitize-address-outline-instrumentation
71+
common:asanwin --copt -fsanitize-address-use-after-return=always
72+
common:asanwin --copt -fsanitize-stable-abi
73+
common:asanwin --copt -fno-sanitize-merge
74+
common:asanwin --copt -fsanitize-recover=all
75+
76+
# Gives:
77+
# lld-link: error: /alternatename: conflicts: __sanitizer_on_print=__sanitizer_on_print__def
78+
# Use --verbose_failures to see the command lines of failed build steps.
79+
# common:asanwin --copt -fsanitize-stats
80+
81+
# Gives:
82+
# lld-link: error: duplicate symbol: __cfi_check_fail
83+
# >>> defined at runfiles.lib(runfiles.obj)
84+
# common:asanwin --copt -fsanitize-cfi-cross-dso
85+
86+
# Gives multiple, like
87+
# lld-link: error: duplicate symbol: __odr_asan_gen_??_R0?AVios_base@std@@@8
88+
# >>> defined at runfiles.lib(runfiles.obj)
89+
# common:asanwin --copt -fsanitize-address-use-odr-indicator
90+
91+
# https://github.com/llvm/llvm-project/blob/main/compiler-rt/lib/asan/asan_flags.inc
92+
common:asanwin --test_env="ASAN_OPTIONS=report_globals=0:detect_odr_violation=0:verbosity=1:debug=1:strict_init_order=1:check_initialization_order=1:detect_stack_use_after_return=1:print_stats=1:verbosity=2:atexit=1:alloc_dealloc_mismatch=1:strict_string_checks=1:halt_on_error=0:malloc_context_size=0:windows_hook_rtl_allocators=1:print_scariness=1"
93+
94+
# https://github.com/llvm/llvm-project/blob/main/compiler-rt/lib/ubsan/ubsan_flags.inc
95+
common:asanwin --test_env="UBSAN_OPTIONS=print_stacktrace=1:report_error_type=1"
96+
# common:asanwin --test_env="ASAN_OPTIONS=help=1"
6897
common:asanwin --cc_output_directory_tag=asanwin
6998
common:asanwin --@otel_sdk//:asanwin=true
70-
71-
# --config=asan : Address Sanitizer.
99+
test:asanwin --test_timeout=3600
100+
# common:asanwin -fno-sanitize-coverage=<value>
101+
# common:asanwin -fno-sanitize-recover=<value>
102+
72103
common:asan --copt -DADDRESS_SANITIZER
73104
common:asan --copt -fsanitize=address,bool,float-cast-overflow,integer-divide-by-zero,null,return,returns-nonnull-attribute,shift-exponent,signed-integer-overflow,unreachable,vla-bound
74105
common:asan --copt -fsanitize-address-use-after-scope
@@ -170,6 +201,8 @@ build --host_copt="-DGRPC_NO_ABSL_SYNC"
170201
# disable all GRPC experiments
171202
# build --define=grpc_experiments_are_final=true
172203

204+
common:devenv --run_under='"c:/windows/system32/cmd.exe" /C start "bazel debug exe" /wait devenv /debugexe '
205+
173206
## This is what my ../top.bazelrc contains (not in the repo as local to my machine)
174207
# build --disk_cache=f:/b/d
175208
# common --repository_cache=f:/b/r

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.2.1
1+
8.3.0rc3

.github/workflows/benchmark.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
mv api-benchmark_result.json benchmarks
4141
mv sdk-benchmark_result.json benchmarks
4242
mv exporters-benchmark_result.json benchmarks
43-
- uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47 # main March 2025
43+
- uses: actions/upload-artifact@de65e23aa2b7e23d713bb51fbfcb6d502f8667d8 # main March 2025
4444
with:
4545
name: benchmark_results
4646
path: benchmarks
@@ -58,7 +58,7 @@ jobs:
5858
egress-policy: audit
5959

6060
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
61-
- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # main March 2025
61+
- uses: actions/download-artifact@448e3f862ab3ef47aa50ff917776823c9946035b # main March 2025
6262
with:
6363
name: benchmark_results
6464
path: benchmarks

.github/workflows/otel_sdk.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
# - uses: Cyberboss/install-winget@6f566e9e227561d5d31e45d65f9b777b3fa8f56f
2323
- run: winget list --accept-source-agreements --disable-interactivity
2424
- run: winget install bazelisk -r bazel --accept-package-agreements --disable-interactivity --silent
25-
- run: winget install -e LLVM.LLVM -v 20.1.6 --accept-package-agreements --disable-interactivity --silent || echo swalloing errors
25+
- run: winget install -e LLVM.LLVM -v 20.1.7 --accept-package-agreements --disable-interactivity --silent || echo swalloing errors
2626
- uses: actions/checkout@v4
2727
- uses: actions/cache/restore@v4
2828
with:

.github/workflows/project_management_comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
egress-policy: audit
2121

2222
- name: Add comment
23-
uses: peter-evans/create-or-update-comment@e5c3b7cef58546e37d0e9e64128fa39d4c31706a
23+
uses: peter-evans/create-or-update-comment@09354dd9af7b86869f7f4989b2a52d8eb1881a9c
2424
with:
2525
issue-number: ${{ github.event.issue.number }}
2626
body: |

MODULE.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ module(
44
compatibility_level = 0,
55
)
66

7-
bazel_dep(name = "abseil-cpp", version = "20250512.0")
8-
bazel_dep(name = "aspect_bazel_lib", version = "2.19.2")
7+
bazel_dep(name = "abseil-cpp", version = "20250512.1")
8+
bazel_dep(name = "aspect_bazel_lib", version = "2.19.4")
99
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1010
bazel_dep(name = "boringssl", version = "0.20250514.0")
1111
bazel_dep(name = "curl", version = "8.8.0.bcr.3")
@@ -14,7 +14,7 @@ bazel_dep(name = "google_benchmark", version = "1.9.4")
1414
bazel_dep(name = "googletest", version = "1.17.0")
1515
bazel_dep(name = "re2", version = "2024-07-02.bcr.1")
1616
bazel_dep(name = "rules_go", version = "0.55.1")
17-
bazel_dep(name = "gazelle", version = "0.43.0")
17+
bazel_dep(name = "gazelle", version = "0.44.0")
1818
bazel_dep(name = "stardoc", version = "0.8.0")
1919
bazel_dep(name = "rules_android", version = "0.6.4")
2020
bazel_dep(name = "grpc", version = "1.72.0")
@@ -27,12 +27,12 @@ single_version_override(
2727
)
2828
bazel_dep(name = "nlohmann_json", version = "3.12.0")
2929
bazel_dep(name = "platforms", version = "1.0.0")
30-
bazel_dep(name = "rules_cc", version = "0.1.1")
30+
bazel_dep(name = "rules_cc", version = "0.1.2")
3131
bazel_dep(name = "rules_pkg", version = "1.1.0")
3232
bazel_dep(name = "rules_proto", version = "7.1.0")
3333
bazel_dep(name = "zlib", version = "1.3.1.bcr.6")
3434
bazel_dep(name = "opentracing-cpp", version = "1.6.0")
35-
bazel_dep(name = "rules_multitool", version = "1.3.0")
35+
bazel_dep(name = "rules_multitool", version = "1.5.0")
3636
bazel_dep(name = "protoc-gen-validate", version = "1.2.1.bcr.1")
3737
bazel_dep(name = "c-ares", version = "1.34.5")
3838
archive_override(
@@ -44,7 +44,7 @@ archive_override(
4444
bazel_dep(name = "protobuf", version = "31.1")
4545
bazel_dep(name = "opentelemetry-proto", version = "1.7.0")
4646
bazel_dep(name = "prometheus-cpp", version = "1.3.0.bcr.2")
47-
bazel_dep(name = "civetweb", version = "1.16.bcr.1")
47+
bazel_dep(name = "civetweb", version = "1.16.bcr.2")
4848

4949
use_repo(
5050
use_extension("@rules_cc//cc:extensions.bzl", "cc_configure_extension"),

api/test/nostd/string_view_test.cc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ TEST(StringViewTest, SubstrPortion)
7272
EXPECT_EQ("12", s.substr(3, 2));
7373
}
7474

75-
TEST(StringViewTest, SubstrOutOfRange)
75+
static void __attribute__((no_sanitize("address"))) StringViewTest_SubstrOutOfRange_NoSanatize()
7676
{
7777
string_view s = "abc123";
7878
#if __EXCEPTIONS || (defined(OPENTELEMETRY_STL_VERSION) && (OPENTELEMETRY_STL_VERSION >= 2017))
@@ -82,6 +82,11 @@ TEST(StringViewTest, SubstrOutOfRange)
8282
#endif
8383
}
8484

85+
TEST(StringViewTest, SubstrOutOfRange)
86+
{
87+
StringViewTest_SubstrOutOfRange_NoSanatize();
88+
}
89+
8590
TEST(StringViewTest, FindSingleCharacter)
8691
{
8792
string_view s = "abc";

0 commit comments

Comments
 (0)