Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
8ea442d
Merge pull request #5 from envoyproxy/master
eric846 Jun 1, 2020
5ac755a
Merge pull request #6 from envoyproxy/master
eric846 Jun 28, 2020
b8c25a5
Merge pull request #7 from envoyproxy/master
eric846 Jul 7, 2020
1c19c68
initial commit
eric846 Jul 9, 2020
7050686
fix comments
eric846 Jul 9, 2020
0776563
fix format
eric846 Jul 9, 2020
16fd8f6
rename adaptive_rps to adaptive_load
eric846 Jul 10, 2020
c383010
add field_selector in example
eric846 Jul 10, 2020
6e1a483
fix example comment
eric846 Jul 10, 2020
4ef1140
fix format
eric846 Jul 10, 2020
4111bf4
add support for fault injection headers
eric846 Jul 10, 2020
871a959
replace linear and binary search with exponential search
eric846 Jul 10, 2020
1fd77c1
add InputVariableSetter mechanism
eric846 Jul 11, 2020
edc36b2
add input variable setter to build file
eric846 Jul 11, 2020
4d0364e
fix syntax errors
eric846 Jul 11, 2020
aed6d94
rename samples/adaptive_rps
eric846 Jul 11, 2020
d9ae87d
improve comments, change step controller initial value from int64 to …
eric846 Jul 12, 2020
a05a6f5
add proto validation rules, fix comments, make rps the default input_…
eric846 Jul 13, 2020
8cd4d21
fix comment wording
eric846 Jul 13, 2020
d814a96
simplify protos, add defaults, specify required or optional
eric846 Jul 14, 2020
5f5a885
add missing newline
eric846 Jul 14, 2020
7e20a78
Kick CI
eric846 Jul 14, 2020
9048267
simplify protos
eric846 Jul 15, 2020
306c0ec
fix format
eric846 Jul 15, 2020
d33f543
fix some optional field comments and rules
eric846 Jul 15, 2020
442cca9
Merge pull request #10 from envoyproxy/master
eric846 Jul 16, 2020
677b783
add Nighthawk status field in BenchmarkResult as nested nighthawk.cli…
eric846 Jul 19, 2020
cefb366
switch to standard Envoy plugin config proto, add prefix to internal …
eric846 Jul 22, 2020
f3684df
Merge remote-tracking branch 'upstream/master' into adaptive-rps-protos2
eric846 Jul 22, 2020
5463051
create headers
eric846 Jul 22, 2020
46e0e25
fix format
eric846 Jul 22, 2020
f634642
use docstring format
eric846 Jul 22, 2020
3c39faa
fix typos in comments
eric846 Jul 23, 2020
b9c8f2b
split build target, get rid of ostream, change InputValueSetter to us…
eric846 Jul 24, 2020
5fc4db4
remove nested namespace, remove redundant _include in target names
eric846 Jul 26, 2020
64e7852
merge from upstream
eric846 Jul 29, 2020
12807f1
Merge remote-tracking branch 'upstream/master' into adaptive-rps-headers
eric846 Jul 29, 2020
e8e960f
merge from upstream
eric846 Aug 27, 2020
6306b4e
Merge remote-tracking branch 'upstream/master' into master2
eric846 Aug 27, 2020
1ece783
Merge remote-tracking branch 'upstream/master' into master2
eric846 Aug 28, 2020
70705e9
Merge remote-tracking branch 'upstream/master' into master2
eric846 Aug 31, 2020
e576bc1
Merge remote-tracking branch 'upstream/master' into master2
eric846 Sep 1, 2020
1fca528
Merge remote-tracking branch 'upstream/master' into master2
eric846 Sep 3, 2020
ed32856
Merge remote-tracking branch 'upstream/master' into master2
eric846 Sep 3, 2020
eecf00d
Merge remote-tracking branch 'upstream/master' into master2
eric846 Sep 8, 2020
13179fb
Merge remote-tracking branch 'upstream/master' into master2
eric846 Sep 10, 2020
3eb89e6
Merge remote-tracking branch 'upstream/master' into master2
eric846 Sep 11, 2020
fae60ad
Merge remote-tracking branch 'upstream/master' into master2
eric846 Sep 12, 2020
9fec200
Merge remote-tracking branch 'upstream/master' into master2
eric846 Sep 14, 2020
9d1cf53
Merge remote-tracking branch 'upstream/master' into master2
eric846 Sep 15, 2020
cfad844
Merge remote-tracking branch 'upstream/master' into master2
eric846 Sep 19, 2020
bdde910
Merge remote-tracking branch 'upstream/master' into master2
eric846 Sep 22, 2020
8100376
Merge remote-tracking branch 'upstream/master' into master2
eric846 Sep 28, 2020
694fda6
Merge remote-tracking branch 'upstream/master' into master2
eric846 Dec 29, 2020
1df6137
Merge remote-tracking branch 'upstream/main'
eric846 Jan 21, 2021
2b9e1e8
Merge remote-tracking branch 'upstream/main'
eric846 Jan 26, 2021
a6da150
Merge remote-tracking branch 'upstream/main'
eric846 Feb 3, 2021
4b8ba84
Merge remote-tracking branch 'upstream/main'
eric846 Feb 4, 2021
eaa20de
Merge remote-tracking branch 'upstream/main'
eric846 Feb 11, 2021
aedd520
Merge remote-tracking branch 'upstream/main'
eric846 Feb 11, 2021
4ec202a
Merge remote-tracking branch 'upstream/main'
eric846 Feb 23, 2021
f42c374
Merge remote-tracking branch 'upstream/main'
eric846 Feb 25, 2021
be5c0fa
Merge remote-tracking branch 'upstream/main'
eric846 Mar 8, 2021
7da182a
Merge remote-tracking branch 'upstream/main'
eric846 Mar 10, 2021
d3e5545
Merge remote-tracking branch 'upstream/main'
eric846 Mar 11, 2021
2f44065
Merge remote-tracking branch 'upstream/main'
eric846 Mar 15, 2021
190a691
Merge remote-tracking branch 'upstream/main'
eric846 Mar 17, 2021
74de764
Merge remote-tracking branch 'upstream/main'
eric846 Mar 18, 2021
c2baebd
Merge remote-tracking branch 'upstream/main'
eric846 Mar 18, 2021
da83218
Merge remote-tracking branch 'upstream/main'
eric846 Mar 22, 2021
e78adac
Merge remote-tracking branch 'upstream/main'
eric846 Mar 25, 2021
f79c078
Merge remote-tracking branch 'upstream/main'
eric846 Mar 29, 2021
a27dfbb
Merge remote-tracking branch 'upstream/main'
eric846 Mar 30, 2021
38bd862
Merge remote-tracking branch 'upstream/main'
eric846 Apr 9, 2021
b1ddd55
Merge remote-tracking branch 'upstream/main'
eric846 Apr 12, 2021
488025b
Update Envoy to 27f67d1 (April 12th 2021)
eric846 Apr 12, 2021
9ded131
fix .bazelrc #unique lines, fix format
eric846 Apr 12, 2021
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
8 changes: 5 additions & 3 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ startup --host_jvm_args=-Xmx2g
build --workspace_status_command="bash bazel/get_workspace_status"
build --experimental_strict_action_env=true
build --host_force_python=PY3
build --action_env=BAZEL_LINKLIBS=-l%:libstdc++.a
build --action_env=BAZEL_LINKOPTS=-lm
build --host_javabase=@bazel_tools//tools/jdk:remote_jdk11
build --javabase=@bazel_tools//tools/jdk:remote_jdk11
build --enable_platform_specific_config
Expand All @@ -35,6 +33,8 @@ build:linux --cxxopt=-std=c++17
build:linux --conlyopt=-fexceptions
build:linux --fission=dbg,opt
build:linux --features=per_object_debug_info
build:linux --action_env=BAZEL_LINKLIBS=-l%:libstdc++.a
build:linux --action_env=BAZEL_LINKOPTS=-lm

# We already have absl in the build, define absl=1 to tell googletest to use absl for backtrace.
build --define absl=1
Expand Down Expand Up @@ -83,6 +83,9 @@ build:clang-asan --linkopt -fuse-ld=lld

# macOS ASAN/UBSAN
build:macos --cxxopt=-std=c++17
build:macos --action_env=BAZEL_LINKLIBS=-l%:libstdc++.a
build:macos --action_env=BAZEL_LINKOPTS=-lm

build:macos-asan --config=asan
# Workaround, see https://github.com/bazelbuild/bazel/issues/6932
build:macos-asan --copt -Wno-macro-redefined
Expand Down Expand Up @@ -363,7 +366,6 @@ build:clang-cl --copt="-Wno-builtin-macro-redefined"
# overrides a member function but is not marked 'override'
# MOCK_METHOD(void, addCallbacks, (StreamCallbacks & callbacks));
build:clang-cl --copt="-Wno-inconsistent-missing-override"
build:clang-cl --action_env=USE_CLANG_CL=1
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Envoy upstream deleted this because it was a duplication of the line about 14 above here.


# Defaults to 'auto' - Off for windows, so override to linux behavior
build:windows --enable_runfiles=yes
Expand Down
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 = "2858cd25cb206f15f4a02f360186d23cc4167da3" # April 06, 2021
ENVOY_SHA = "95df261de8ab7d71936d3e4822de5c7b2d96c41461422203d59b4bc4c6b4f4dd"
ENVOY_COMMIT = "27f67d18277648affef80e659ccc68cdfaaa418c" # April 12, 2021
ENVOY_SHA = "82be18e5647fba9df97bf46a4ec2ccc7753e57addcde1e068b6f98a61d9f113f"

HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
Expand Down
6 changes: 3 additions & 3 deletions ci/run_envoy_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ if is_windows; then
# CI sets it to a Linux-specific value. Undo this once https://github.com/envoyproxy/envoy/issues/13272
# is resolved.
ENVOY_DOCKER_OPTIONS=()
DEFAULT_ENVOY_DOCKER_BUILD_DIR=C:/Windows/Temp/envoy-docker-build
# Replace MSYS style drive letter (/c/) with Windows drive letter designation (C:/)
DEFAULT_ENVOY_DOCKER_BUILD_DIR=$(echo "${TEMP}" | sed -E "s#^/([a-zA-Z])/#\1:/#")/envoy-docker-build
BUILD_DIR_MOUNT_DEST=C:/build
# Replace MSYS style drive letter (/c/) with driver letter designation (C:/)
SOURCE_DIR=$(echo "${PWD}" | sed -E "s#/([a-zA-Z])/#\1:/#")
SOURCE_DIR=$(echo "${PWD}" | sed -E "s#^/([a-zA-Z])/#\1:/#")
SOURCE_DIR_MOUNT_DEST=C:/source
START_COMMAND=("bash" "-c" "cd source && $*")
else
Expand Down