Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Not to add check attributes if check is disabled #1981

Merged
merged 2 commits into from
Sep 22, 2018
Merged

Not to add check attributes if check is disabled #1981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe7703e
Not to add check attributes if check is disabled
qiwzhang Sep 21, 2018
7b36290
Remove ExtractRequestAttributes
qiwzhang Sep 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions include/istio/control/http/request_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,10 @@ class RequestHandler {

// Make a Report call. It will:
// * check service config to see if Report is required
// * extract check attributes if not done yet.
// * extract more report attributes
// * make a Report call.
virtual void Report(ReportData* report_data) = 0;

// Extract the request attributes for Report() call.
// This is called at Report time when Check() is not called.
// Normally request attributes are extracted at Check() call.
// This is for cases the requests are rejected by http filters
// before mixer, such as fault injection, or auth.
//
// Usage: at Envoy filter::log() function
// if (!hander) {
// handle = control->CreateHandler();
// handler->ExtractRequestAttributes();
// }
// handler->Report();
//
virtual void ExtractRequestAttributes(CheckData* check_data) = 0;
virtual void Report(CheckData* check_data, ReportData* report_data) = 0;
};

} // namespace http
Expand Down
10 changes: 5 additions & 5 deletions src/envoy/http/mixer/filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,15 +282,15 @@ void Filter::log(const HeaderMap* request_headers,
::istio::control::http::Controller::PerRouteConfig config;
ReadPerRouteConfig(request_info.routeEntry(), &config);
handler_ = control_.controller()->CreateRequestHandler(config);

CheckData check_data(*request_headers, request_info.dynamicMetadata(),
nullptr);
handler_->ExtractRequestAttributes(&check_data);
}

// If check is NOT called, check attributes are not extracted.
CheckData check_data(*request_headers, request_info.dynamicMetadata(),
decoder_callbacks_->connection());
// response trailer header is not counted to response total size.
ReportData report_data(response_headers, response_trailers, request_info,
request_total_size_);
handler_->Report(&report_data);
handler_->Report(&check_data, &report_data);
}

} // namespace Mixer
Expand Down
35 changes: 30 additions & 5 deletions src/istio/control/http/request_handler_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,31 @@ namespace http {

RequestHandlerImpl::RequestHandlerImpl(
std::shared_ptr<ServiceContext> service_context)
: service_context_(service_context) {}
: service_context_(service_context),
check_attributes_added_(false),
forward_attributes_added_(false) {}

void RequestHandlerImpl::AddForwardAttributes(CheckData* check_data) {
if (forward_attributes_added_) {
return;
}
forward_attributes_added_ = true;

AttributesBuilder builder(&request_context_);
builder.ExtractForwardedAttributes(check_data);
}

void RequestHandlerImpl::AddCheckAttributes(CheckData* check_data) {
if (check_attributes_added_) {
return;
}
check_attributes_added_ = true;

void RequestHandlerImpl::ExtractRequestAttributes(CheckData* check_data) {
if (service_context_->enable_mixer_check() ||
service_context_->enable_mixer_report()) {
service_context_->AddStaticAttributes(&request_context_);

AttributesBuilder builder(&request_context_);
builder.ExtractForwardedAttributes(check_data);
builder.ExtractCheckAttributes(check_data);

service_context_->AddApiAttributes(check_data, &request_context_);
Expand All @@ -48,7 +64,9 @@ CancelFunc RequestHandlerImpl::Check(CheckData* check_data,
HeaderUpdate* header_update,
TransportCheckFunc transport,
CheckDoneFunc on_done) {
ExtractRequestAttributes(check_data);
// Forwarded attributes need to be stored regardless Check is needed
// or not since the header will be updated or removed.
AddForwardAttributes(check_data);
header_update->RemoveIstioAttributes();
service_context_->InjectForwardedAttributes(header_update);

Expand All @@ -59,17 +77,24 @@ CancelFunc RequestHandlerImpl::Check(CheckData* check_data,
return nullptr;
}

AddCheckAttributes(check_data);

service_context_->AddQuotas(&request_context_);

return service_context_->client_context()->SendCheck(transport, on_done,
&request_context_);
}

// Make remote report call.
void RequestHandlerImpl::Report(ReportData* report_data) {
void RequestHandlerImpl::Report(CheckData* check_data,
ReportData* report_data) {
if (!service_context_->enable_mixer_report()) {
return;
}

AddForwardAttributes(check_data);
AddCheckAttributes(check_data);

AttributesBuilder builder(&request_context_);
builder.ExtractReportAttributes(report_data);

Expand Down
14 changes: 11 additions & 3 deletions src/istio/control/http/request_handler_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,24 @@ class RequestHandlerImpl : public RequestHandler {
::istio::mixerclient::CheckDoneFunc on_done) override;

// Make a Report call.
void Report(ReportData* report_data) override;

void ExtractRequestAttributes(CheckData* check_data) override;
void Report(CheckData* check_data, ReportData* report_data) override;

private:
// Add Forward attributes, allow re-entry
void AddForwardAttributes(CheckData* check_data);
// Add check attributes, allow re-entry
void AddCheckAttributes(CheckData* check_data);

// The request context object.
RequestContext request_context_;

// The service context.
std::shared_ptr<ServiceContext> service_context_;

// If true, request attributes are added
bool check_attributes_added_;
// If true, forward attributes are added
bool forward_attributes_added_;
};

} // namespace http
Expand Down
28 changes: 16 additions & 12 deletions src/istio/control/http/request_handler_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@ TEST_F(RequestHandlerImplTest, TestHandlerDisabledCheckReport) {
TEST_F(RequestHandlerImplTest, TestHandlerDisabledCheck) {
::testing::NiceMock<MockCheckData> mock_data;
::testing::NiceMock<MockHeaderUpdate> mock_header;
// Report is enabled so Attributes are extracted.
EXPECT_CALL(mock_data, GetSourceIpPort(_, _)).Times(1);
EXPECT_CALL(mock_data, GetPrincipal(_, _)).Times(2);
// Report is enabled so Check Attributes are not extracted.
EXPECT_CALL(mock_data, GetSourceIpPort(_, _)).Times(0);
EXPECT_CALL(mock_data, GetPrincipal(_, _)).Times(0);

// Check should NOT be called.
EXPECT_CALL(*mock_client_, Check(_, _, _, _)).Times(0);
Expand Down Expand Up @@ -462,9 +462,11 @@ TEST_F(RequestHandlerImplTest, TestDefaultApiKey) {
}

TEST_F(RequestHandlerImplTest, TestHandlerReport) {
::testing::NiceMock<MockReportData> mock_data;
EXPECT_CALL(mock_data, GetResponseHeaders()).Times(1);
EXPECT_CALL(mock_data, GetReportInfo(_)).Times(1);
::testing::NiceMock<MockCheckData> mock_check;
::testing::NiceMock<MockReportData> mock_report;
EXPECT_CALL(mock_check, GetSourceIpPort(_, _)).Times(1);
EXPECT_CALL(mock_report, GetResponseHeaders()).Times(1);
EXPECT_CALL(mock_report, GetReportInfo(_)).Times(1);

// Report should be called.
EXPECT_CALL(*mock_client_, Report(_)).Times(1);
Expand All @@ -474,13 +476,15 @@ TEST_F(RequestHandlerImplTest, TestHandlerReport) {
ApplyPerRouteConfig(config, &per_route);

auto handler = controller_->CreateRequestHandler(per_route);
handler->Report(&mock_data);
handler->Report(&mock_check, &mock_report);
}

TEST_F(RequestHandlerImplTest, TestHandlerDisabledReport) {
::testing::NiceMock<MockReportData> mock_data;
EXPECT_CALL(mock_data, GetResponseHeaders()).Times(0);
EXPECT_CALL(mock_data, GetReportInfo(_)).Times(0);
::testing::NiceMock<MockCheckData> mock_check;
::testing::NiceMock<MockReportData> mock_report;
EXPECT_CALL(mock_check, GetSourceIpPort(_, _)).Times(0);
EXPECT_CALL(mock_report, GetResponseHeaders()).Times(0);
EXPECT_CALL(mock_report, GetReportInfo(_)).Times(0);

// Report should NOT be called.
EXPECT_CALL(*mock_client_, Report(_)).Times(0);
Expand All @@ -491,7 +495,7 @@ TEST_F(RequestHandlerImplTest, TestHandlerDisabledReport) {
ApplyPerRouteConfig(config, &per_route);

auto handler = controller_->CreateRequestHandler(per_route);
handler->Report(&mock_data);
handler->Report(&mock_check, &mock_report);
}

TEST_F(RequestHandlerImplTest, TestEmptyConfig) {
Expand Down Expand Up @@ -528,7 +532,7 @@ TEST_F(RequestHandlerImplTest, TestEmptyConfig) {
[](const CheckResponseInfo& info) {
EXPECT_TRUE(info.response_status.ok());
});
handler->Report(&mock_report);
handler->Report(&mock_check, &mock_report);
}

} // namespace http
Expand Down