Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump clang-format from 14.0.6 to 17.0.6 in /tools/base #919

Closed
wants to merge 2 commits into from
Closed

build(deps): bump clang-format from 14.0.6 to 17.0.6 in /tools/base #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6f5299
outlier: changing to use statusor
alyssawilk Dec 11, 2023
3835ac3
build(deps): bump clang-format from 14.0.6 to 17.0.6 in /tools/base
dependabot[bot] Dec 11, 2023
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
6 changes: 4 additions & 2 deletions source/common/upstream/cluster_factory_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,12 @@ ClusterFactoryImplBase::create(const envoy::config::cluster::v3::Cluster& cluste
}
}

new_cluster_pair.first->setOutlierDetector(Outlier::DetectorImplFactory::createForCluster(
auto detector_or_error = Outlier::DetectorImplFactory::createForCluster(
*new_cluster_pair.first, cluster, server_context.mainThreadDispatcher(),
server_context.runtime(), context.outlierEventLogger(),
server_context.api().randomGenerator()));
server_context.api().randomGenerator());
RETURN_IF_STATUS_NOT_OK(detector_or_error);
new_cluster_pair.first->setOutlierDetector(detector_or_error.value());

return status_or_cluster;
}
Expand Down
6 changes: 3 additions & 3 deletions source/common/upstream/outlier_detection_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace Envoy {
namespace Upstream {
namespace Outlier {

DetectorSharedPtr DetectorImplFactory::createForCluster(
absl::StatusOr<DetectorSharedPtr> DetectorImplFactory::createForCluster(
Cluster& cluster, const envoy::config::cluster::v3::Cluster& cluster_config,
Event::Dispatcher& dispatcher, Runtime::Loader& runtime, EventLoggerSharedPtr event_logger,
Random::RandomGenerator& random) {
Expand Down Expand Up @@ -284,7 +284,7 @@ DetectorImpl::~DetectorImpl() {
}
}

std::shared_ptr<DetectorImpl>
absl::StatusOr<std::shared_ptr<DetectorImpl>>
DetectorImpl::create(Cluster& cluster, const envoy::config::cluster::v3::OutlierDetection& config,
Event::Dispatcher& dispatcher, Runtime::Loader& runtime,
TimeSource& time_source, EventLoggerSharedPtr event_logger,
Expand All @@ -293,7 +293,7 @@ DetectorImpl::create(Cluster& cluster, const envoy::config::cluster::v3::Outlier
new DetectorImpl(cluster, config, dispatcher, runtime, time_source, event_logger, random));

if (detector->config().maxEjectionTimeMs() < detector->config().baseEjectionTimeMs()) {
throwEnvoyExceptionOrPanic(
return absl::InvalidArgumentError(
"outlier detector's max_ejection_time cannot be smaller than base_ejection_time");
}
detector->initialize(cluster);
Expand Down
4 changes: 2 additions & 2 deletions source/common/upstream/outlier_detection_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace Outlier {
*/
class DetectorImplFactory {
public:
static DetectorSharedPtr
static absl::StatusOr<DetectorSharedPtr>
createForCluster(Cluster& cluster, const envoy::config::cluster::v3::Cluster& cluster_config,
Event::Dispatcher& dispatcher, Runtime::Loader& runtime,
EventLoggerSharedPtr event_logger, Random::RandomGenerator& random);
Expand Down Expand Up @@ -372,7 +372,7 @@ class DetectorConfig {
*/
class DetectorImpl : public Detector, public std::enable_shared_from_this<DetectorImpl> {
public:
static std::shared_ptr<DetectorImpl>
static absl::StatusOr<std::shared_ptr<DetectorImpl>>
create(Cluster& cluster, const envoy::config::cluster::v3::OutlierDetection& config,
Event::Dispatcher& dispatcher, Runtime::Loader& runtime, TimeSource& time_source,
EventLoggerSharedPtr event_logger, Random::RandomGenerator& random);
Expand Down
160 changes: 106 additions & 54 deletions test/common/upstream/outlier_detection_impl_test.cc
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tools/base/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ aio.api.github>=0.2.5
aiohttp>=3.8.1
aioquic>=0.9.21
cffi>=1.15.0
clang-format==14.0.6
clang-format==17.0.6
clang-tidy==14.0.6
colorama
coloredlogs
Expand Down
26 changes: 16 additions & 10 deletions tools/base/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,16 +383,22 @@ charset-normalizer==3.3.0 \
--hash=sha256:f8888e31e3a85943743f8fc15e71536bda1c81d5aa36d014a3c0c44481d7db6e \
--hash=sha256:fc52b79d83a3fe3a360902d3f5d79073a993597d48114c29485e9431092905d8
# via requests
clang-format==14.0.6 \
--hash=sha256:13f2d6d4a2af004a783c65f0921afa8f0384bffcdaf500b6c2cb542edeb0b4a5 \
--hash=sha256:810c649ab97d208cd418c897d50ab6e958eb8d96854527edd80d0dd21a75e914 \
--hash=sha256:aaf4edecc46a24f0b572b82cf5827e292ad1c137903427627c4d5f671668cc2b \
--hash=sha256:bd400c47665dd19afc03f98e747f78ed828abab99c6a1b07e137b35c1cd3cc26 \
--hash=sha256:c93580945f75de7e01996f1fb3cf67e4dc424f1c864e237c85614fb99a48c7a4 \
--hash=sha256:d5c96b500d7f8b5d2db5b75ac035be387512850ad589cdc3019666b861382136 \
--hash=sha256:d780c04334bca80f2b60d25bf53c37bd0618520ee295a7888a11f25bde114ac4 \
--hash=sha256:d7c1c5e404c58e55f0170f01b3c5611dce6c119e62b5d1020347e0ad97d5a047 \
--hash=sha256:dbfd60528eb3bb7d7cfe8576faa70845fbf93601f815ef75163d36606e87f388
clang-format==17.0.6 \
--hash=sha256:195014a589fde9e2bec447ee1f2efd31f8c9f773b10aa66b510beae6997e6bc5 \
--hash=sha256:2a1323ca5322e0dead521223155fe2ae1ba81d50abab8e20aaac28f6a94f23b9 \
--hash=sha256:2c7364a50c4fdb8ce9acc4e0c21627e52f4eebee98ff2d8a19b6d4302d0be23b \
--hash=sha256:2ddc8b6237520d26d78489e3bb876243d87c3629eb3cd40e1df0c8c6e355d949 \
--hash=sha256:33c4f1975a6a0a76e5b85165c510c46ae1155f82477a5730e29799e43d78c83a \
--hash=sha256:393f896db6155d6b8401ebae40df1f9a8cdf15d494d13fb775657c9ec609b586 \
--hash=sha256:50f082840d2e013160355ed63add4502884344371dda5af12ec0abe68cbc5a36 \
--hash=sha256:5476f8fba40e4330a4704681386d78751ced0ecbd050bd0687817cca01d4e167 \
--hash=sha256:5cda40badfb01818ece739509d9cde678fc02660180cc1a55156782ef203704d \
--hash=sha256:879e831c58a25a9b7527155032a6dc4758716ded69590911468a37629acb13d1 \
--hash=sha256:9407f0f4cb5a26b96af38bb2261f1c4015127f4d87ce46a61bb3a3c2a3d4f3cc \
--hash=sha256:a0f744b056cb1595efdb7d2b83a7d73370e506e17fcaa68cd884c2ed029ae0fd \
--hash=sha256:afc29c4413b5f2f885347f4bdbb7fe81f595faeceafa640c9e67a2d9aa2c7134 \
--hash=sha256:ccb6f5ce90f24ed0bb314d041a8edcc94d1279c1469669d5855be004d9d6caff \
--hash=sha256:edd55b840fa6edcdafb1651c3c24c6ea8d911e73be30373e7e8e5741cb585464
# via -r requirements.in
clang-tidy==14.0.6 \
--hash=sha256:02bce40a56cc344e20d2f63bef6b85acf9837954559e0091804d6e748dfc0359 \
Expand Down
1 change: 0 additions & 1 deletion tools/code_format/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ paths:
- source/common/upstream/subset_lb_config.cc
- source/common/upstream/load_balancer_impl.cc
- source/common/upstream/cluster_manager_impl.cc
- source/common/upstream/outlier_detection_impl.cc
- source/common/upstream/upstream_impl.cc
- source/common/upstream/default_local_address_selector_factory.cc
- source/common/network/listen_socket_impl.cc
Expand Down