Envoy update 1725048099 (#1217)

- Update `ENVOY_COMMIT` to the latest Envoy's commit. - Update affected `ENVOY_LOG` and `ENVOY_LOG_MISC` function calls to accommodate the changes in envoyproxy/envoy#35869. - Add the `Http1PrematureUpstreamHalfClose` case to `StreamDecoder::streamResetReasonToResponseFlag` to accommodate envoyproxy/envoy#34461. Signed-off-by: jiajunye <[email protected]>
envoyproxy · Sep 3, 2024 · bb29935 · bb29935
1 parent 0d752a8
commit bb29935
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
@@ -1,7 +1,7 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-ENVOY_COMMIT = "3f36f1466de11624958614a3fd46d9ce208ed5b5"
-ENVOY_SHA = "2f571eaf477a28205352b6aa84da9055c90a6f3a81816a32f01cd96027b95de4"
+ENVOY_COMMIT = "b661f52c82218f1d1159ed1c5bd4c6436649d350"
+ENVOY_SHA = "08c88e49d00d46380419a3d81901d14927a6fc126abf3945392dda9afacd55f9"
 
 HDR_HISTOGRAM_C_VERSION = "0.11.2"  # October 12th, 2020
 HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"

diff --git a/source/client/stream_decoder.cc b/source/client/stream_decoder.cc
@@ -161,6 +161,7 @@ StreamDecoder::streamResetReasonToResponseFlag(Envoy::Http::StreamResetReason re
     return Envoy::StreamInfo::CoreResponseFlag::UpstreamConnectionTermination;
   case Envoy::Http::StreamResetReason::LocalReset:
   case Envoy::Http::StreamResetReason::LocalRefusedStreamReset:
+  case Envoy::Http::StreamResetReason::Http1PrematureUpstreamHalfClose:
     return Envoy::StreamInfo::CoreResponseFlag::LocalReset;
   case Envoy::Http::StreamResetReason::Overflow:
     return Envoy::StreamInfo::CoreResponseFlag::UpstreamOverflow;

diff --git a/source/distributor/service_impl.cc b/source/distributor/service_impl.cc
@@ -104,11 +104,11 @@ grpc::Status NighthawkDistributorServiceImpl::DistributedRequestStream(
         ENVOY_LOG(trace, "Wrote DistributedResponse {}", absl::StrCat(response));
       }
     } else {
-      ENVOY_LOG(error, "DistributedRequest invalid: ({}) '{}'", status.error_code(),
-                status.error_message());
+      ENVOY_LOG(error, "DistributedRequest invalid: ({}) '{}'",
+                static_cast<int>(status.error_code()), status.error_message());
     }
   }
-  ENVOY_LOG(trace, "Finishing stream with status {}:{}", status.error_code(),
+  ENVOY_LOG(trace, "Finishing stream with status {}:{}", static_cast<int>(status.error_code()),
             status.error_message());
   return status;
 }

diff --git a/source/sink/service_impl.cc b/source/sink/service_impl.cc
@@ -35,8 +35,8 @@ grpc::Status SinkServiceImpl::StoreExecutionResponseStream(
 grpc::Status abslStatusToGrpcStatus(const absl::Status& status) {
   grpc::Status grpc_status =
       status.ok() ? grpc::Status::OK : grpc::Status(grpc::StatusCode::INTERNAL, status.ToString());
-  ENVOY_LOG_MISC(trace, "Finishing stream with status {} / message {}.", grpc_status.error_code(),
-                 grpc_status.error_message());
+  ENVOY_LOG_MISC(trace, "Finishing stream with status {} / message {}.",
+                 static_cast<int>(grpc_status.error_code()), grpc_status.error_message());
   return grpc_status;
 }