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.

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

header: getting rid of exception-throwing behaviors in header files [the rest] #12611

Merged
merged 19 commits into from
Aug 14, 2020

Conversation

stedsome
Copy link
Contributor

This is the continuation of #12502, as discussed here #12469.

Commit Message:
Additional Description: One notable change is that I rewrote some macro definitions using ternary operators to using lambda expressions as ternary operators require the type of operands on both sides of ":" to be the same. Replacing throw statement with a void function breaks this rule.
Risk Level: Low
Testing: All existing tests passed
Docs Changes:
Release Notes:
[Optional Runtime guard:]
[Optional Fixes #Issue]
[Optional Deprecated:]

@yanavlasov yanavlasov self-assigned this Aug 12, 2020
if (std::isnan(msg.field_name().value())) { \
ExceptionUtil::throwEnvoyException(fmt::format("Value not in the range of 0..100 range.")); \
} \
if (msg.has_##field_name()) { \
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this can be ternary

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sure

ExceptionUtil::throwEnvoyException(
fmt::format("filter {} does not support protocol options", name_));
// to satisfy compiler and should never reach here.
return nullptr;
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you can annotate the throwEnvoyException() with the ABSL_ATTRIBUTE_NORETURN attribute to prevent compiler from complaining about missing return statements.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, I actually did but forgot to remove the artifact here.

if (std::isnan(msg.field_name().value())) { \
ExceptionUtil::throwEnvoyException(fmt::format("Value not in the range of 0..100 range.")); \
} \
if (msg.has_##field_name()) { \
Copy link
Contributor

Choose a reason for hiding this comment

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

Make it ternary?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

++

Yifan Yang added 2 commits August 12, 2020 17:52
Signed-off-by: Yifan Yang <[email protected]>
@stedsome
Copy link
Contributor Author

@yanavlasov @lizan do you mind taking a look and rerun the failed test as I think that is just a flaky one

@yanavlasov yanavlasov merged commit 5f3a35a into envoyproxy:master Aug 14, 2020
mpuncel added a commit to mpuncel/envoy that referenced this pull request Aug 14, 2020
* master: (67 commits)
  logger: support log control in admin interface and command line option for Fancy Logger (envoyproxy#12369)
  test: fix http_timeout_integration_test flake (envoyproxy#12654)
  [fuzz]added an input check in writefilter fuzzer and added test cases (envoyproxy#12628)
  add 'explicit' restriction. (envoyproxy#12643)
  scoped_rds_integration_test migrate from api v2 to api v3. (envoyproxy#12633)
  fuzz: added fuzz test for listener filter tls_inspector (envoyproxy#12617)
  testing: fix multiple race conditions in simulated time tests (envoyproxy#12527)
  [tls] Move handshaking behavior into SslSocketInfo. (envoyproxy#12571)
  header: getting rid of exception-throwing behaviors in header files [the rest] (envoyproxy#12611)
  router: add new ratelimited retry backoff strategy (envoyproxy#12202)
  [redis_proxy] added a constraint for route.prefix().size() (envoyproxy#12637)
  network: add tcp listener backlog config (envoyproxy#12625)
  runtime: debug log that condition is always true when fractionalPercent numerator > denominator (envoyproxy#12068)
  WatchDog Extension hook (envoyproxy#12416)
  router: add dynamic metadata header formatter (envoyproxy#11858)
  statsd: revert visibility to public (envoyproxy#12621)
  Fix regression of /build_* in gitignore (envoyproxy#12630)
  Added a missing extension point to documentation. (envoyproxy#12620)
  Reverts proxy protocol test on windows (envoyproxy#12619)
  caching: Improved the tests and coverage of the CacheFilter tree (envoyproxy#12544)
  ...

Signed-off-by: Michael Puncel <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants