cherry-pick of envoyproxy#13683 (#280)

Signed-off-by: Kuat Yessenov <kuat@google.com>
istio · Oct 28, 2020 · e5a3c35 · e5a3c35
1 parent cdbfe70
commit e5a3c35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/source/common/router/router.cc b/source/common/router/router.cc
@@ -374,6 +374,7 @@ Http::FilterHeadersStatus Filter::decodeHeaders(Http::RequestHeaderMap& headers,
   if (direct_response != nullptr) {
     config_.stats_.rq_direct_response_.inc();
     direct_response->rewritePathHeader(headers, !config_.suppress_envoy_headers_);
+    callbacks_->streamInfo().setRouteName(direct_response->routeName());
     callbacks_->sendLocalReply(
         direct_response->responseCode(), direct_response->responseBody(),
         [this, direct_response,
@@ -392,7 +393,6 @@ Http::FilterHeadersStatus Filter::decodeHeaders(Http::RequestHeaderMap& headers,
           direct_response->finalizeResponseHeaders(response_headers, callbacks_->streamInfo());
         },
         absl::nullopt, StreamInfo::ResponseCodeDetails::get().DirectResponse);
-    callbacks_->streamInfo().setRouteName(direct_response->routeName());
     return Http::FilterHeadersStatus::StopIteration;
   }
 

diff --git a/test/integration/integration_test.cc b/test/integration/integration_test.cc
@@ -189,9 +189,11 @@ TEST_P(IntegrationTest, RouterDirectResponseWithBody) {
 }
 
 TEST_P(IntegrationTest, RouterDirectResponseEmptyBody) {
+  useAccessLog("%ROUTE_NAME%");
   static const std::string domain("direct.example.com");
   static const std::string prefix("/");
   static const Http::Code status(Http::Code::OK);
+  static const std::string route_name("direct_response_route");
   config_helper_.addConfigModifier(
       [&](envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager&
               hcm) -> void {
@@ -215,6 +217,7 @@ TEST_P(IntegrationTest, RouterDirectResponseEmptyBody) {
         virtual_host->add_routes()->mutable_match()->set_prefix(prefix);
         virtual_host->mutable_routes(0)->mutable_direct_response()->set_status(
             static_cast<uint32_t>(status));
+        virtual_host->mutable_routes(0)->set_name(route_name);
       });
   initialize();
 
@@ -230,6 +233,9 @@ TEST_P(IntegrationTest, RouterDirectResponseEmptyBody) {
   EXPECT_EQ(nullptr, response->headers().ContentType());
   // Content-length header is correct.
   EXPECT_EQ("0", response->headers().getContentLengthValue());
+
+  std::string log = waitForAccessLog(access_log_name_);
+  EXPECT_THAT(log, HasSubstr(route_name));
 }
 
 TEST_P(IntegrationTest, ConnectionClose) {