Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,15 @@ build:remote-ci --remote_executor=grpcs://remotebuildexecution.googleapis.com
# Fuzz builds
build:asan-fuzzer --config=clang-asan
build:asan-fuzzer --define=FUZZING_ENGINE=libfuzzer
build:asan-fuzzer --copt=-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
build:asan-fuzzer --copt=-fsanitize=fuzzer-no-link
build:asan-fuzzer --copt=-fno-omit-frame-pointer
# Remove UBSAN halt_on_error to avoid crashing on protobuf errors.
build:asan-fuzzer --test_env=UBSAN_OPTIONS=print_stacktrace=1

# Fuzzing without ASAN. This is useful for profiling fuzzers without any ASAN artifacts.
build:plain-fuzzer --define=FUZZING_ENGINE=libfuzzer
build:plain-fuzzer --copt=-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
build:plain-fuzzer --copt=-fsanitize=fuzzer-no-link

try-import %workspace%/clang.bazelrc
try-import %workspace%/user.bazelrc
4 changes: 2 additions & 2 deletions bazel/repositories.bzl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

ENVOY_COMMIT = "9be85fbc561c373875a0102dddf9baf5a86543c1" # March 10th, 2020
ENVOY_SHA = "111e34dd9f97700d6030dbac7fc826cb7c5fe4a1cccef3cc05c83508c84c6692"
ENVOY_COMMIT = "c34b82f261be45f60a4df8e40937f4066d20797b" # March 18th, 2020
ENVOY_SHA = "e64eeffce4d29cde2ca6b74956c0142cbe3b80259a754810001e19d841b64b99"

RULES_PYTHON_COMMIT = "dd7f9c5f01bafbfea08c44092b6b0c8fc8fcb77f" # Feb 22nd, 2020
RULES_PYTHON_SHA = "0aa9ec790a58053e3ab5af397879b267a625955f8297c239b2d8559c6773397b"
Expand Down
1 change: 0 additions & 1 deletion source/client/process_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,6 @@ void ProcessImpl::maybeCreateTracingDriver(const envoy::config::trace::v3::Traci
Envoy::Runtime::LoaderSingleton::get(), *local_info_, generator_, time_system_);
http_tracer_ =
std::make_unique<Envoy::Tracing::HttpTracerImpl>(std::move(zipkin_driver), *local_info_);
http_context_.setTracer(*http_tracer_);
#else
ENVOY_LOG(error, "Not build with any tracing support");
#endif
Expand Down