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: 7 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ build:macos --copt -UDEBUG
# Startup options cannot be selected via config.
startup --host_jvm_args=-Xmx2g

run --color=yes

build --color=yes
build --workspace_status_command="bash bazel/get_workspace_status"
build --experimental_strict_action_env=true
build --host_force_python=PY3
Expand Down Expand Up @@ -55,6 +58,10 @@ build:sanitizer --test_tag_filters=-no_san
build:clang --action_env=BAZEL_COMPILER=clang
build:clang --linkopt=-fuse-ld=lld

# Flags for Clang + PCH
build:clang-pch --spawn_strategy=local
build:clang-pch --define=ENVOY_CLANG_PCH=1

# Basic ASAN/UBSAN that works for gcc
build:asan --action_env=ENVOY_ASAN=1
build:asan --config=sanitizer
Expand Down
10 changes: 8 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 = "398794730b8a2651e004cfe2ca82de0eaa02ba4b" # Jun 14, 2021
ENVOY_SHA = "43a75705147602976eb943789a2246f4da04e1bfaff927687a99b9fe116fa78a"
ENVOY_COMMIT = "0af628456676b71fb8484a0730f69b1f9808ad31" # Jun 21, 2021
ENVOY_SHA = "79c9251159b963ae7b678f324958055ca957da5d541af1315d1116c5501c6cda"

HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
Expand Down Expand Up @@ -56,3 +56,9 @@ cc_library(
url = "https://github.com/HdrHistogram/HdrHistogram_c/archive/%s.tar.gz" % HDR_HISTOGRAM_C_VERSION,
# // clang-format on
)

# // GRPC has a dependency on gtest which needs to be bound: https://github.com/grpc/grpc/commit/decc199ca8472b3e55b9779aafc0c682514b70c7 but envoy binds to googletest instead which doesn't seem to work in this case. https://github.com/envoyproxy/envoy/pull/16687/files#R507
native.bind(
name = "gtest",
actual = "@com_google_googletest//:gtest",
)
2 changes: 2 additions & 0 deletions ci/run_envoy_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ mkdir -p "${ENVOY_DOCKER_BUILD_DIR}"

export ENVOY_BUILD_IMAGE="${IMAGE_NAME}:${IMAGE_ID}"

time docker pull "${ENVOY_BUILD_IMAGE}"

# Since we specify an explicit hash, docker-run will pull from the remote repo if missing.
docker run --rm \
"${ENVOY_DOCKER_OPTIONS[@]}" \
Expand Down
2 changes: 2 additions & 0 deletions source/client/stream_decoder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ StreamDecoder::streamResetReasonToResponseFlag(Envoy::Http::StreamResetReason re
return Envoy::StreamInfo::ResponseFlag::UpstreamRemoteReset;
case Envoy::Http::StreamResetReason::ProtocolError:
return Envoy::StreamInfo::ResponseFlag::UpstreamProtocolError;
case Envoy::Http::StreamResetReason::OverloadManager:
return Envoy::StreamInfo::ResponseFlag::OverloadManager;
}
NOT_REACHED_GCOVR_EXCL_LINE;
}
Expand Down