update

Signed-off-by: Jose Nino <jnino@lyft.com>
envoyproxy · Dec 15, 2021 · 3cc1dc2 · 3cc1dc2
1 parent bda195c
commit 3cc1dc2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/library/common/extensions/filters/http/platform_bridge/filter.cc b/library/common/extensions/filters/http/platform_bridge/filter.cc
@@ -202,7 +202,8 @@ envoy_stream_intel PlatformBridgeFilter::streamIntel() {
   auto& info = decoder_callbacks_->streamInfo();
   // FIXME: Stream handle cannot currently be set from the filter context.
   envoy_stream_intel stream_intel{-1, -1, 0};
-  stream_intel.connection_id = info.upstreamConnectionId().value_or(-1);
+  stream_intel.connection_id =
+      info.upstreamInfo() ? info.upstreamInfo()->upstreamConnectionId().value_or(-1) : -1;
   stream_intel.attempt_count = info.attemptCount().value_or(0);
   return stream_intel;
 }

diff --git a/library/common/http/client.cc b/library/common/http/client.cc
@@ -325,7 +325,8 @@ envoy_stream_intel Client::DirectStreamCallbacks::streamIntel() {
 
 void Client::DirectStream::saveLatestStreamIntel() {
   const auto& info = request_decoder_->streamInfo();
-  stream_intel_.connection_id = info.upstreamConnectionId().value_or(-1);
+  stream_intel_.connection_id =
+      info.upstreamInfo() ? info.upstreamInfo()->upstreamConnectionId().value_or(-1) : -1;
   stream_intel_.stream_id = static_cast<uint64_t>(stream_handle_);
   stream_intel_.attempt_count = info.attemptCount().value_or(0);
   saveFinalStreamIntel();