Skip to content

Increase code coverage in conn_manager_impl #417

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
RomanDzhabarov merged 3 commits into from
Feb 6, 2017
Merged

Increase code coverage in conn_manager_impl #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47b93c7
test.
RomanDzhabarov Feb 3, 2017
1569fef
comments.
RomanDzhabarov Feb 4, 2017
50b0084
std.
RomanDzhabarov Feb 4, 2017
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
53 changes: 29 additions & 24 deletions source/common/http/conn_manager_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,27 @@ void ConnectionManagerImpl::onDrainTimeout() {
checkForDeferredClose();
}

void ConnectionManagerImpl::chargeTracingStats(const Tracing::Reason& tracing_reason,
ConnectionManagerTracingStats& tracing_stats) {
switch (tracing_reason) {
case Tracing::Reason::ClientForced:
tracing_stats.client_enabled_.inc();
break;
case Tracing::Reason::NotTraceableRequestId:
tracing_stats.not_traceable_.inc();
break;
case Tracing::Reason::Sampling:
tracing_stats.random_sampling_.inc();
break;
case Tracing::Reason::ServiceForced:
tracing_stats.service_forced_.inc();
break;
default:
throw std::invalid_argument(
fmt::format("invalid tracing reason, value: {}", static_cast<int32_t>(tracing_reason)));
}
}

ConnectionManagerImpl::ActiveStream::ActiveStream(ConnectionManagerImpl& connection_manager)
: connection_manager_(connection_manager),
stream_id_(ConnectionManagerUtility::generateStreamId(
Expand All @@ -288,8 +309,12 @@ ConnectionManagerImpl::ActiveStream::~ActiveStream() {
log_handler->log(request_headers_.get(), response_headers_.get(), request_info_);
}

if (active_span_ && !request_info_.healthCheck()) {
Tracing::HttpTracerUtility::finalizeSpan(*active_span_, request_info_);
if (active_span_) {
if (request_info_.healthCheck()) {
connection_manager_.config_.tracingStats().health_check_.inc();
} else {
Tracing::HttpTracerUtility::finalizeSpan(*active_span_, request_info_);
}
}
}

Expand Down Expand Up @@ -334,27 +359,6 @@ void ConnectionManagerImpl::ActiveStream::chargeStats(HeaderMap& headers) {
}
}

void ConnectionManagerImpl::ActiveStream::chargeTracingStats(
const Tracing::Decision& tracing_decision) {
switch (tracing_decision.reason) {
case Tracing::Reason::ClientForced:
connection_manager_.config_.tracingStats().client_enabled_.inc();
break;
case Tracing::Reason::HealthCheck:
connection_manager_.config_.tracingStats().health_check_.inc();
break;
case Tracing::Reason::NotTraceableRequestId:
connection_manager_.config_.tracingStats().not_traceable_.inc();
break;
case Tracing::Reason::Sampling:
connection_manager_.config_.tracingStats().random_sampling_.inc();
break;
case Tracing::Reason::ServiceForced:
connection_manager_.config_.tracingStats().service_forced_.inc();
break;
}
}

uint64_t ConnectionManagerImpl::ActiveStream::connectionId() {
return connection_manager_.read_callbacks_->connection().id();
}
Expand Down Expand Up @@ -437,7 +441,8 @@ void ConnectionManagerImpl::ActiveStream::decodeHeaders(HeaderMapPtr&& headers,
if (connection_manager_.config_.tracingConfig().valid()) {
Tracing::Decision tracing_decision =
Tracing::HttpTracerUtility::isTracing(request_info_, *request_headers_);
chargeTracingStats(tracing_decision);
ConnectionManagerImpl::chargeTracingStats(tracing_decision.reason,
connection_manager_.config_.tracingStats());

if (tracing_decision.is_tracing) {
active_span_ = connection_manager_.tracer_.startSpan(*this, *request_headers_, request_info_);
Expand Down
3 changes: 2 additions & 1 deletion source/common/http/conn_manager_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ class ConnectionManagerImpl : Logger::Loggable<Logger::Id::http>,
static ConnectionManagerStats generateStats(const std::string& prefix, Stats::Store& stats);
static ConnectionManagerTracingStats generateTracingStats(const std::string& prefix,
Stats::Store& stats);
static void chargeTracingStats(const Tracing::Reason& tracing_reason,
ConnectionManagerTracingStats& tracing_stats);

// Network::ReadFilter
Network::FilterStatus onData(Buffer::Instance& data) override;
Expand Down Expand Up @@ -355,7 +357,6 @@ class ConnectionManagerImpl : Logger::Loggable<Logger::Id::http>,
~ActiveStream();

void chargeStats(HeaderMap& headers);
void chargeTracingStats(const Tracing::Decision& tracing_decision);
std::list<ActiveStreamEncoderFilterPtr>::iterator
commonEncodePrefix(ActiveStreamEncoderFilter* filter, bool end_stream);
uint64_t connectionId();
Expand Down
36 changes: 34 additions & 2 deletions test/common/http/conn_manager_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,13 @@ TEST_F(HttpConnectionManagerImplTest, StartAndFinishSpanNormalFlow) {
setup(false, "");

NiceMock<Tracing::MockSpan>* span = new NiceMock<Tracing::MockSpan>();
EXPECT_CALL(tracer_, startSpan_(_, _, _)).WillOnce(Return(span));
EXPECT_CALL(tracer_, startSpan_(_, _, _))
.WillOnce(Invoke([&](const Tracing::Config& config, const Http::HeaderMap&,
const Http::AccessLog::RequestInfo&) -> Tracing::Span* {
EXPECT_EQ("operation", config.operationName());

return span;
}));
EXPECT_CALL(*span, finishSpan());
EXPECT_CALL(runtime_.snapshot_, featureEnabled("tracing.global_enabled", 100, _))
.WillOnce(Return(true));
Expand Down Expand Up @@ -240,6 +246,9 @@ TEST_F(HttpConnectionManagerImplTest, StartAndFinishSpanNormalFlow) {

Buffer::OwnedImpl fake_input("1234");
conn_manager_->onData(fake_input);

EXPECT_EQ(1UL, tracing_stats_.service_forced_.value());
EXPECT_EQ(0UL, tracing_stats_.random_sampling_.value());
}

TEST_F(HttpConnectionManagerImplTest, TestAccessLog) {
Expand Down Expand Up @@ -355,7 +364,7 @@ TEST_F(HttpConnectionManagerImplTest, StartSpanOnlyHealthCheckRequest) {
Http::HeaderMapPtr headers{
new TestHeaderMapImpl{{":authority", "host"},
{":path", "/healthcheck"},
{"x-request-id", "125a4afb-6f55-a4ba-ad80-413f09f48a28"}}};
{"x-request-id", "125a4afb-6f55-94ba-ad80-413f09f48a28"}}};
decoder->decodeHeaders(std::move(headers), true);

Http::HeaderMapPtr response_headers{new TestHeaderMapImpl{{":status", "200"}}};
Expand All @@ -366,6 +375,14 @@ TEST_F(HttpConnectionManagerImplTest, StartSpanOnlyHealthCheckRequest) {

Buffer::OwnedImpl fake_input("1234");
conn_manager_->onData(fake_input);

// Force dtor of active stream to be called so that we can capture tracing HC stat.
filter_callbacks_.connection_.dispatcher_.clearDeferredDeleteList();

// HC request, but was originally sampled, so check for two stats here.
EXPECT_EQ(1UL, tracing_stats_.random_sampling_.value());
EXPECT_EQ(1UL, tracing_stats_.health_check_.value());
EXPECT_EQ(0UL, tracing_stats_.service_forced_.value());
}

TEST_F(HttpConnectionManagerImplTest, NoPath) {
Expand Down Expand Up @@ -865,4 +882,19 @@ TEST_F(HttpConnectionManagerImplTest, MultipleFilters) {
encoder_filter1->callbacks_->continueEncoding();
}

TEST(HttpConnectionManagerTracingStatsTest, verifyTracingStats) {
Stats::IsolatedStoreImpl stats;
ConnectionManagerTracingStats tracing_stats{CONN_MAN_TRACING_STATS(POOL_COUNTER(stats))};

EXPECT_THROW(
ConnectionManagerImpl::chargeTracingStats(Tracing::Reason::HealthCheck, tracing_stats),
std::invalid_argument);

ConnectionManagerImpl::chargeTracingStats(Tracing::Reason::ClientForced, tracing_stats);
EXPECT_EQ(1UL, tracing_stats.client_enabled_.value());

ConnectionManagerImpl::chargeTracingStats(Tracing::Reason::NotTraceableRequestId, tracing_stats);
EXPECT_EQ(1UL, tracing_stats.not_traceable_.value());
}

} // Http