stream_info: cleaning up setters and getters #19139
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -631,9 +631,6 @@ class OverridableRemoteConnectionInfoSetterStreamInfo : public StreamInfo::Strea | |
| Ssl::ConnectionInfoConstSharedPtr sslConnection() const override { | ||
| return StreamInfoImpl::downstreamAddressProvider().sslConnection(); | ||
| } | ||
| void dumpState(std::ostream& os, int indent_level) const override { | ||
| StreamInfoImpl::dumpState(os, indent_level); | ||
|
|
||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -848,6 +848,7 @@ ClientConnectionImpl::ClientConnectionImpl( | |
| false), | ||
| stream_info_(dispatcher_.timeSource(), socket_->connectionInfoProviderSharedPtr()) { | ||
|
|
||
| stream_info_.setUpstreamInfo(std::make_shared<StreamInfo::UpstreamInfoImpl>()); | ||
| // There are no meaningful socket options or source address semantics for | ||
| // non-IP sockets, so skip. | ||
| if (socket_->connectionInfoProviderSharedPtr()->remoteAddress()->ip() == nullptr) { | ||
|
|
@@ -891,7 +892,7 @@ void ClientConnectionImpl::connect() { | |
| socket_->connectionInfoProvider().remoteAddress()->asString()); | ||
| const Api::SysCallIntResult result = | ||
| socket_->connect(socket_->connectionInfoProvider().remoteAddress()); | ||
| stream_info_.upstreamInfo()->upstreamTiming().onUpstreamConnectStart(dispatcher_.timeSource()); | ||
| if (result.return_value_ == 0) { | ||
| // write will become ready. | ||
| ASSERT(connecting_); | ||
|
|
@@ -921,7 +922,7 @@ void ClientConnectionImpl::connect() { | |
| } | ||
|
|
||
| void ClientConnectionImpl::onConnected() { | ||
| stream_info_.upstreamInfo()->upstreamTiming().onUpstreamConnectComplete(dispatcher_.timeSource()); | ||
| ConnectionImpl::onConnected(); | ||
| } | ||
|
|
||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,9 @@ EnvoyQuicClientSession::EnvoyQuicClientSession( | |
| quic::QuicSpdyClientSession(config, supported_versions, connection.release(), server_id, | ||
| crypto_config.get(), push_promise_index), | ||
| crypto_config_(crypto_config), crypto_stream_factory_(crypto_stream_factory), | ||
| quic_stat_names_(quic_stat_names), scope_(scope) { | ||
| streamInfo().setUpstreamInfo(std::make_shared<StreamInfo::UpstreamInfoImpl>()); | ||
| } | ||
|
|
||
| EnvoyQuicClientSession::~EnvoyQuicClientSession() { | ||
| ASSERT(!connection()->connected()); | ||
|
|
@@ -31,7 +33,7 @@ EnvoyQuicClientSession::~EnvoyQuicClientSession() { | |
| absl::string_view EnvoyQuicClientSession::requestedServerName() const { return server_id().host(); } | ||
|
|
||
| void EnvoyQuicClientSession::connect() { | ||
| streamInfo().upstreamInfo()->upstreamTiming().onUpstreamConnectStart(dispatcher_.timeSource()); | ||
| dynamic_cast<EnvoyQuicClientConnection*>(network_connection_) | ||
| ->setUpConnectionSocket( | ||
| *static_cast<EnvoyQuicClientConnection*>(connection())->connectionSocket(), *this); | ||
|
|
@@ -133,8 +135,9 @@ void EnvoyQuicClientSession::OnTlsHandshakeComplete() { | |
| // before use. This may result in OnCanCreateNewOutgoingStream with zero | ||
| // available streams. | ||
| OnCanCreateNewOutgoingStream(false); | ||
| streamInfo().upstreamInfo()->upstreamTiming().onUpstreamConnectComplete(dispatcher_.timeSource()); | ||
| streamInfo().upstreamInfo()->upstreamTiming().onUpstreamHandshakeComplete( | ||
| dispatcher_.timeSource()); | ||
|
|
||
| raiseConnectionEvent(Network::ConnectionEvent::Connected); | ||
| } | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -96,8 +96,8 @@ parseMetadataField(absl::string_view params_str, bool upstream = true) { | |
|
|
||
| return [upstream, params](const Envoy::StreamInfo::StreamInfo& stream_info) -> std::string { | ||
| const envoy::config::core::v3::Metadata* metadata = nullptr; | ||
| if (upstream && stream_info.upstreamInfo()) { | ||
| Upstream::HostDescriptionConstSharedPtr host = stream_info.upstreamInfo()->upstreamHost(); | ||
| if (!host) { | ||
| return std::string(); | ||
| } | ||
|
|
@@ -330,8 +330,8 @@ StreamInfoHeaderFormatter::StreamInfoHeaderFormatter(absl::string_view field_nam | |
| field_extractor_ = parseSubstitutionFormatField(field_name, formatter_map_); | ||
| } else if (field_name == "UPSTREAM_REMOTE_ADDRESS") { | ||
| field_extractor_ = [](const Envoy::StreamInfo::StreamInfo& stream_info) -> std::string { | ||
| if (stream_info.upstreamInfo() && stream_info.upstreamInfo()->upstreamHost()) { | ||
| return stream_info.upstreamInfo()->upstreamHost()->address()->asString(); | ||
| } | ||
| return ""; | ||
| }; | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR seems quite similar to #19118? Does this PR replace that one?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, theoretically. there's 2 issues with that one - the clang tidy which I have fixed locally (not pushed) and the windows build failure, which I could not figure out. I was hoping removing the getters would remove the build failure but left it assigned my way until I was sure.
if it's too big to combine getter and setter clean up, I can likely submit removing getters first, but didn't want to break it up until 1) I knew it fixed the problem and 2) checking to see if you wanted it split or were OK with the one large PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This approach seems totally fine. No need to split. It's a lot of movement but it's largely mechanical/straightforward. It's not like there's lots of complex interactions which are changing, I think.