Use std::optional instead of absl::optional#45607
Merged
Merged
Conversation
nezdolik
requested review from
KBaichoo,
RyanTheOptimist,
abeyad,
adisuissa,
agrawroh,
botengyao,
danzh2010,
fredyw,
ggreenway,
krinkinmu,
kyessenov,
mathetake,
mattklein123,
paul-r-gall,
phlax,
ravenblackx,
tonya11en,
tyxia,
wbpcode,
yanavlasov,
yanjunxiang-google and
zuercher
as code owners
mathetake
previously approved these changes
Jun 12, 2026
Contributor
|
Wow thanks for slogging through this. I think we should lock main to get CI pass for this PR and then merge it. Otherwise merge conflicts will be wack-a-mole. /wait-any |
Contributor
|
/wait-any |
Member
Author
|
PR for contrib: #45658 |
agrawroh
previously approved these changes
Jun 16, 2026
Member
|
need to wait for the release, and address the merge conflicts. /wait |
nezdolik
force-pushed
the
absl-opt-to-std-opt
branch
from
ea8c030 to
3b0ec3f
Compare
nezdolik
force-pushed
the
absl-opt-to-std-opt
branch
from
3b0ec3f to
0828ab3
Compare
Member
Author
|
@yanavlasov @botengyao here is resynced version after security release. Feel free to merge if all passes and looks good |
Member
|
😱 8000+ |
Contributor
|
Oh, sorry, my PR with the function change caused merge conflicts and GH says it is too complex to resolve in web editor. I will hold off on checking exception refactors, so we can close on this one. /wait |
Contributor
|
Also looks like mobile format is not happy. https://github.com/envoyproxy/envoy/actions/runs/28097997526/job/83192404353#step:21:772 |
nezdolik
force-pushed
the
absl-opt-to-std-opt
branch
from
0828ab3 to
62419e5
Compare
Abseil has deprecated absl::optional in favor of the standard library optional type. Migrate Envoy sources and tests to std::optional, std::nullopt, and std::make_optional. Update the format checker to reject the deprecated absl optional APIs and cover the diagnostics with check_format fixtures. Signed-off-by: Kateryna Nezdolii <kateryna.nezdolii@gmail.com>
nezdolik
force-pushed
the
absl-opt-to-std-opt
branch
from
62419e5 to
e7ebaed
Compare
Member
Author
|
rebased on top of latest main, fixed mobile format check, fingers crossed all passes now |
Member
Author
|
@yanavlasov ptal |
yanavlasov
approved these changes
Jun 25, 2026
bellatoris
added a commit
to bellatoris/envoy
that referenced
this pull request
Jul 5, 2026
Conflicts were confined to the RESP3-extended client factory lineage and resolved by adopting upstream envoyproxy#45607 std::optional/std::nullopt spelling while keeping the RESP3 additions: - ClientFactory/ClientImpl create + ctor signatures keep the appended upstream_protocol_version and OptRef<Stats::Counter> hello-failure params (OptRef args stay absl::nullopt per OptRef convention) - ClientFactoryImpl::create keeps the unconditional initialize() (init routing moved inside ClientImpl by the RESP3 init state machine) - proxy_filter.cc keeps both new includes: upstream <openssl/mem.h> (envoyproxy#45472 constant-time password compare) and RESP3 <algorithm> - HEXPIRE (envoyproxy#44887) and cluster string_view (envoyproxy#45967) merged cleanly Signed-off-by: Doogie Min <doogie.min@sendbird.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Abseil is deprecating absl::optional, so migrate Envoy's codebase to std::optional, std::nullopt, and std::make_optional.
Update the format checker to reject the deprecated Abseil optional APIs and header, and refresh the formatter test fixtures.
Codex/Ai assisted.
Commit Message:
Additional Description:
Risk Level: Low
Testing:
Docs Changes:
Release Notes:
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #Issue]
[Optional Fixes commit #PR or SHA]
[Optional Deprecated:]
[Optional API Considerations:]