Skip to content

fix: upstream grpc stats on trailers only #10842

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
mattklein123 merged 2 commits into from
Apr 20, 2020
Merged

fix: upstream grpc stats on trailers only #10842

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
f0d911d
fix: upstream grpc stats on trailers only
Sh4d1 Apr 19, 2020
bfcc17c
refacto send upstream grpc stats
Sh4d1 Apr 20, 2020
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
26 changes: 16 additions & 10 deletions source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,9 @@ class GrpcStatsFilter : public Http::PassThroughFilter {
if (doStatTracking()) {
config_->context_.chargeStat(*cluster_, Grpc::Context::Protocol::Grpc, request_names_,
headers.GrpcStatus());
if (end_stream) {
maybeChargeUpstreamStat();
}
}
return Http::FilterHeadersStatus::Continue;
}
Expand All @@ -228,16 +231,7 @@ class GrpcStatsFilter : public Http::PassThroughFilter {
if (doStatTracking()) {
config_->context_.chargeStat(*cluster_, Grpc::Context::Protocol::Grpc, request_names_,
trailers.GrpcStatus());

if (config_->enable_upstream_stats_ &&
decoder_callbacks_->streamInfo().lastUpstreamTxByteSent().has_value() &&
decoder_callbacks_->streamInfo().lastUpstreamRxByteReceived().has_value()) {
std::chrono::milliseconds chrono_duration =
std::chrono::duration_cast<std::chrono::milliseconds>(
decoder_callbacks_->streamInfo().lastUpstreamRxByteReceived().value() -
decoder_callbacks_->streamInfo().lastUpstreamTxByteSent().value());
config_->context_.chargeUpstreamStat(*cluster_, request_names_, chrono_duration);
}
maybeChargeUpstreamStat();
}
return Http::FilterTrailersStatus::Continue;
}
Expand All @@ -260,6 +254,18 @@ class GrpcStatsFilter : public Http::PassThroughFilter {
filter_object_->response_message_count = response_counter_.frameCount();
}

void maybeChargeUpstreamStat() {
if (config_->enable_upstream_stats_ &&
decoder_callbacks_->streamInfo().lastUpstreamTxByteSent().has_value() &&
decoder_callbacks_->streamInfo().lastUpstreamRxByteReceived().has_value()) {
std::chrono::milliseconds chrono_duration =
std::chrono::duration_cast<std::chrono::milliseconds>(
decoder_callbacks_->streamInfo().lastUpstreamRxByteReceived().value() -
decoder_callbacks_->streamInfo().lastUpstreamTxByteSent().value());
config_->context_.chargeUpstreamStat(*cluster_, request_names_, chrono_duration);
}
}

private:
ConfigConstSharedPtr config_;
GrpcStatsObject* filter_object_{};
Expand Down
27 changes: 27 additions & 0 deletions test/extensions/filters/http/grpc_stats/config_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,33 @@ TEST_F(GrpcStatsFilterConfigTest, UpstreamStats) {
doRequestResponse(request_headers);
}

TEST_F(GrpcStatsFilterConfigTest, UpstreamStatsWithTrailersOnly) {
config_.mutable_stats_for_all_methods()->set_value(true);
config_.set_emit_filter_state(true);
config_.set_enable_upstream_stats(true);
initialize();

ON_CALL(stream_info_, lastUpstreamRxByteReceived())
.WillByDefault(testing::Return(
absl::optional<std::chrono::nanoseconds>(std::chrono::nanoseconds(30000000))));
ON_CALL(stream_info_, lastUpstreamTxByteSent())
.WillByDefault(testing::Return(
absl::optional<std::chrono::nanoseconds>(std::chrono::nanoseconds(20000000))));

EXPECT_CALL(stats_store_,
deliverHistogramToSinks(
Property(&Stats::Metric::name,
"grpc.lyft.users.BadCompanions.GetBadCompanions.upstream_rq_time"),
10ul));
Http::TestRequestHeaderMapImpl request_headers{
{"content-type", "application/grpc+proto"},
{":path", "/lyft.users.BadCompanions/GetBadCompanions"}};

EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter_->decodeHeaders(request_headers, false));
Http::TestResponseHeaderMapImpl response_headers{{":status", "500"}};
EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter_->encodeHeaders(response_headers, true));
}

} // namespace
} // namespace GrpcStats
} // namespace HttpFilters
Expand Down