From f7cd67b083e53023a15d7ba24413bee1e0d0b1d8 Mon Sep 17 00:00:00 2001 From: Qian Sun Date: Wed, 28 Dec 2016 12:51:02 -0800 Subject: [PATCH 1/3] Fix t test failures in esp. --- contrib/endpoints/src/api_manager/context/request_context.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/endpoints/src/api_manager/context/request_context.cc b/contrib/endpoints/src/api_manager/context/request_context.cc index d7ac9c93beb..153626a4c4b 100644 --- a/contrib/endpoints/src/api_manager/context/request_context.cc +++ b/contrib/endpoints/src/api_manager/context/request_context.cc @@ -264,7 +264,7 @@ void RequestContext::FillReportRequestInfo( // Must be after response_code and method are assigned. FillLogMessage(info); - if(!method()->request_streaming() && !method()->response_streaming()) { + if(method() && !method()->request_streaming() && !method()->response_streaming()) { response->GetLatencyInfo(&info->latency); } } From 0aee26a599bce871f5e2f581272ff212d02bdf80 Mon Sep 17 00:00:00 2001 From: Qian Sun Date: Wed, 28 Dec 2016 13:54:33 -0800 Subject: [PATCH 2/3] Add flag is_streaming to determine whether to get latency. --- .../endpoints/src/api_manager/context/request_context.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/endpoints/src/api_manager/context/request_context.cc b/contrib/endpoints/src/api_manager/context/request_context.cc index 153626a4c4b..36020e3a33e 100644 --- a/contrib/endpoints/src/api_manager/context/request_context.cc +++ b/contrib/endpoints/src/api_manager/context/request_context.cc @@ -264,7 +264,11 @@ void RequestContext::FillReportRequestInfo( // Must be after response_code and method are assigned. FillLogMessage(info); - if(method() && !method()->request_streaming() && !method()->response_streaming()) { + bool is_streaming = false; + if(method() && (method()->request_streaming() || method()->response_streaming())) { + is_streaming = true; + } + if(!is_streaming) { response->GetLatencyInfo(&info->latency); } } From 6931a25a04006e52a6e15b4c07176ad50e883e53 Mon Sep 17 00:00:00 2001 From: Qian Sun Date: Wed, 28 Dec 2016 14:51:01 -0800 Subject: [PATCH 3/3] clang format changes. --- contrib/endpoints/src/api_manager/context/request_context.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/endpoints/src/api_manager/context/request_context.cc b/contrib/endpoints/src/api_manager/context/request_context.cc index 36020e3a33e..cbf4e925e37 100644 --- a/contrib/endpoints/src/api_manager/context/request_context.cc +++ b/contrib/endpoints/src/api_manager/context/request_context.cc @@ -265,10 +265,11 @@ void RequestContext::FillReportRequestInfo( // Must be after response_code and method are assigned. FillLogMessage(info); bool is_streaming = false; - if(method() && (method()->request_streaming() || method()->response_streaming())) { + if (method() && + (method()->request_streaming() || method()->response_streaming())) { is_streaming = true; } - if(!is_streaming) { + if (!is_streaming) { response->GetLatencyInfo(&info->latency); } }