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
30 changes: 15 additions & 15 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,30 +40,30 @@ important maintenance task. When performing the update, follow this procedure:
1. Create a fork of Nighthawk, or fetch upstream and merge changes into your
fork if you already have one.
1. Create a new branch from `main`, e.g. `envoy-update`.
1. Edit [bazel/repositories.bzl](bazel/repositories.bzl).
1. Edit [bazel/repositories.bzl](bazel/repositories.bzl)
1. Update `ENVOY_COMMIT` to the latest Envoy's commit from
[this page](https://github.com/envoyproxy/envoy/commits/main). (Clicking on the
short commit id opens a page that contains the fully expanded commit id).
1. Set `ENVOY_SHA` to an empty string initially, we will get the correct
sha256 after the first bazel execution.
Example content of `bazel/repositories.bzl` after the edits:
```
ENVOY_COMMIT = "9753819331d1547c4b8294546a6461a3777958f5"  # Jan 24th, 2021
ENVOY_SHA = ""
```
1. Run `ci/do_ci.sh build`, notice the sha256 value at the top of the output,
example:
```
INFO: SHA256 (https://github.com/envoyproxy/envoy/archive/9753819331d1547c4b8294546a6461a3777958f5.tar.gz) = f4d26c7e78c0a478d959ea8bc877f260d4658a8b44e294e3a400f20ad44d41a3
```
1. Update `ENVOY_SHA` in [bazel/repositories.bzl](bazel/repositories.bzl) to
this value.
Example content of `bazel/repositories.bzl` after the edits:
```
ENVOY_COMMIT = "9753819331d1547c4b8294546a6461a3777958f5"  # Jan 24th, 2021
ENVOY_SHA = ""
```
1. Run `ci/do_ci.sh build`, notice the sha256 value at the top of the output,
example:
```
INFO: SHA256 (https://github.com/envoyproxy/envoy/archive/9753819331d1547c4b8294546a6461a3777958f5.tar.gz) = f4d26c7e78c0a478d959ea8bc877f260d4658a8b44e294e3a400f20ad44d41a3
```
1. Update `ENVOY_SHA` in [bazel/repositories.bzl](bazel/repositories.bzl) to
this value.
1. Sync (copy) [.bazelrc](.bazelrc) from
[Envoy's version](https://github.com/envoyproxy/envoy/blob/main/.bazelrc) to
update our build configurations. Be sure to retain our local modifications,
all lines that are unique to Nighthawk are marked with comment `# unique`.
1. In the updated [.bazelrc](.bazelrc) search for `experimental_docker_image`.
Copy the SHA and update `envoyproxy/envoy-build-ubuntu` over at the top of [.circleci/config.yml](.circleci/config.yml).
1. If [.bazelrc](.bazelrc) was modified, search for `experimental_docker_image`.
Copy the SHA and update `envoyproxy/envoy-build-ubuntu` over at the top of [.circleci/config.yml](.circleci/config.yml).
1. Sync (copy) [.bazelversion](.bazelversion) from
[Envoy's version](https://github.com/envoyproxy/envoy/blob/main/.bazelversion)
to ensure we are using the same build system version.
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 = "751be72c2eb967ff03759b6e50dde106c8cf5c84" # April 19, 2021
ENVOY_SHA = "43a538a299f0169cd6b15d3a8d757b51870487bb7e50766108f0917e5974f412"
ENVOY_COMMIT = "0143bc2ec23c621c6979687c5998633c9f126aa3" # April 26, 2021
ENVOY_SHA = "3023211783605908f3a5e3053a236ca323312fcef601f44144e24c667e6626f7"

HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
Expand Down
1 change: 1 addition & 0 deletions source/client/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ envoy_cc_library(
"@envoy//source/server:server_lib_with_external_headers",
"@envoy//source/server/config_validation:admin_lib_with_external_headers",
"@envoy//include/envoy/http:protocol_interface_with_external_headers",
"@envoy//include/envoy/network:address_interface",
"@envoy//source/common/common:statusor_lib_with_external_headers",
"@envoy//source/common/router:context_lib_with_external_headers",
] + select({
Expand Down
6 changes: 4 additions & 2 deletions source/client/process_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <memory>
#include <random>

#include "envoy/network/address.h"
#include "envoy/server/filter_config.h"
#include "envoy/stats/sink.h"
#include "envoy/stats/store.h"
Expand Down Expand Up @@ -136,8 +137,9 @@ ProcessImpl::ProcessImpl(const Options& options, Envoy::Event::TimeSystem& time_
singleton_manager_(std::make_unique<Envoy::Singleton::ManagerImpl>(api_->threadFactory())),
access_log_manager_(std::chrono::milliseconds(1000), *api_, *dispatcher_, access_log_lock_,
store_root_),
init_watcher_("Nighthawk", []() {}), validation_context_(false, false, false),
router_context_(store_root_.symbolTable()) {
init_watcher_("Nighthawk", []() {}),
admin_(Envoy::Network::Address::InstanceConstSharedPtr()),
validation_context_(false, false, false), router_context_(store_root_.symbolTable()) {
// Any dispatchers created after the following call will use hr timers.
setupForHRTimers();
std::string lower = absl::AsciiStrToLower(
Expand Down