Skip to content

Not to use api_key if its service is not activated. #109

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

Merged
qiwzhang merged 1 commit into from
Feb 21, 2017
Merged

Not to use api_key if its service is not activated. #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion contrib/endpoints/src/api_manager/context/request_context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@ void RequestContext::FillOperationInfo(service_control::OperationInfo *info) {
info->operation_name = kUnrecognizedOperation;
}
info->operation_id = operation_id_;
if (check_response_info_.is_api_key_valid) {
if (check_response_info_.is_api_key_valid &&
check_response_info_.service_is_activated) {
info->api_key = api_key_;
}
info->producer_project_id = service_context()->project_id();
Expand Down
15 changes: 7 additions & 8 deletions contrib/endpoints/src/api_manager/service_control/proto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,14 +956,13 @@ Status Proto::FillReportRequest(const ReportRequestInfo& info,
}
}

// Not to send consumer metrics for following cases:
// 1) api_key is not provided, or
// 2) the service is not activated for the consumer project,
bool send_consumer_metric = true;
if (info.api_key.empty() ||
!info.check_response_info.service_is_activated) {
send_consumer_metric = false;
}
// Not to send consumer metrics if api_key is empty.
// api_key is empty in one of following cases:
// 1) api_key is not provided,
// 2) api_key is invalid determined by the server from the Check call.
// 3) the service is not activated for the consumer project.
bool send_consumer_metric = !info.api_key.empty();

// Populate all metrics.
for (auto it = metrics_.begin(), end = metrics_.end(); it != end; it++) {
const SupportedMetric* m = *it;
Expand Down