Log urls and headers in BIDIRECTIONAL_STREAM events

net/http/bidirectional_stream.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/bidirectional_stream.h"
 
 #include <memory>
+#include <string>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
+#include "base/values.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/bidirectional_stream_request_info.h"
+#include "net/http/http_log_util.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_stream.h"
 #include "net/spdy/spdy_http_utils.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/ssl/ssl_config.h"
 #include "url/gurl.h"
 
 namespace net {
 
+namespace {
+
+std::unique_ptr<base::Value> NetLogHeadersCallback(
+    const SpdyHeaderBlock* headers,

[mef, 2016/04/28 20:43:18]

#include "net/spdy/spdy_header_block.h"

[xunjieli, 2016/04/28 21:06:15]

Done.

+    NetLogCaptureMode capture_mode) {

[mef, 2016/04/28 20:43:18]

#include "net/log/net_log_capture_mode.h"

[xunjieli, 2016/04/28 21:06:15]

Done.

+  std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
+  dict->Set("headers", SpdyHeaderBlockToListValue(*headers, capture_mode));
+  return std::move(dict);
+}
+
+std::unique_ptr<base::Value> NetLogCallback(const GURL* url,
+                                            const std::string* method,
+                                            const HttpRequestHeaders* headers,
+                                            NetLogCaptureMode capture_mode) {
+  std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
+  dict->SetString("url", url->possibly_invalid_spec());
+  dict->SetString("method", *method);
+  std::string empty;
+  std::unique_ptr<base::Value> headers_param(
+      headers->NetLogCallback(&empty, capture_mode));
+  dict->Set("headers", std::move(headers_param));
+  return std::move(dict);
+}
+
+}  // namespace
+
 BidirectionalStream::Delegate::Delegate() {}
 
 void BidirectionalStream::Delegate::OnStreamReady() {}
 
 BidirectionalStream::Delegate::~Delegate() {}
 
 BidirectionalStream::BidirectionalStream(
     std::unique_ptr<BidirectionalStreamRequestInfo> request_info,
     HttpNetworkSession* session,
     bool disable_auto_flush,
@@ skipping 39 matching lines @@
   http_request_info.extra_headers = request_info_->extra_headers;
   stream_request_.reset(
       session->http_stream_factory()->RequestBidirectionalStreamImpl(
           http_request_info, request_info_->priority, server_ssl_config,
           server_ssl_config, this, net_log_));
   // Check that this call cannot fail to set a non-NULL |stream_request_|.
   DCHECK(stream_request_);
   // Check that HttpStreamFactory does not invoke OnBidirectionalStreamImplReady
   // synchronously.
   DCHECK(!stream_impl_);
+  if (net_log_.IsCapturing()) {
+    net_log_.BeginEvent(
+        NetLog::TYPE_BIDIRECTIONAL_STREAM_ALIVE,
+        base::Bind(&NetLogCallback, &request_info_->url, &request_info_->method,
+                   base::Unretained(&request_info_->extra_headers)));
+  }
 }
 
 BidirectionalStream::~BidirectionalStream() {
   Cancel();
+  net_log_.EndEvent(NetLog::TYPE_BIDIRECTIONAL_STREAM_ALIVE);

[mef, 2016/04/28 20:43:18]

Should this also be guarded by net_log_.IsCapturing()?

[xunjieli, 2016/04/28 21:06:15]

Done. good catch! thanks

 }
 
 int BidirectionalStream::ReadData(IOBuffer* buf, int buf_len) {
   DCHECK(stream_impl_);
 
   int rv = stream_impl_->ReadData(buf, buf_len);
   if (rv > 0) {
     net_log_.AddByteTransferEvent(
         NetLog::TYPE_BIDIRECTIONAL_STREAM_BYTES_RECEIVED, rv, buf->data());
   } else if (rv == ERR_IO_PENDING) {
@@ skipping 64 matching lines @@
 }
 
 void BidirectionalStream::OnHeadersReceived(
     const SpdyHeaderBlock& response_headers) {
   HttpResponseInfo response_info;
   if (!SpdyHeadersToHttpResponse(response_headers, HTTP2, &response_info)) {
     DLOG(WARNING) << "Invalid headers";
     delegate_->OnFailed(ERR_FAILED);
     return;
   }
-
+  if (net_log_.IsCapturing()) {
+    net_log_.AddEvent(NetLog::TYPE_BIDIRECTIONAL_STREAM_RECV_HEADERS,
+                      base::Bind(&NetLogHeadersCallback, &response_headers));
+  }
   session_->http_stream_factory()->ProcessAlternativeServices(
       session_, response_info.headers.get(),
       url::SchemeHostPort(request_info_->url));
   delegate_->OnHeadersReceived(response_headers);
 }
 
 void BidirectionalStream::OnDataRead(int bytes_read) {
   DCHECK(read_buffer_);
 
-  net_log_.AddByteTransferEvent(
-      NetLog::TYPE_BIDIRECTIONAL_STREAM_BYTES_RECEIVED, bytes_read,
-      read_buffer_->data());
+  if (net_log_.IsCapturing()) {
+    net_log_.AddByteTransferEvent(
+        NetLog::TYPE_BIDIRECTIONAL_STREAM_BYTES_RECEIVED, bytes_read,
+        read_buffer_->data());
+  }
   read_buffer_ = nullptr;
   delegate_->OnDataRead(bytes_read);
 }
 
 void BidirectionalStream::OnDataSent() {
   DCHECK(!write_buffer_list_.empty());
   DCHECK_EQ(write_buffer_list_.size(), write_buffer_len_list_.size());
 
-  for (size_t i = 0; i < write_buffer_list_.size(); ++i) {
-    net_log_.AddByteTransferEvent(NetLog::TYPE_BIDIRECTIONAL_STREAM_BYTES_SENT,
-                                  write_buffer_len_list_[i],
-                                  write_buffer_list_[i]->data());
+  if (net_log_.IsCapturing()) {
+    for (size_t i = 0; i < write_buffer_list_.size(); ++i) {
+      net_log_.AddByteTransferEvent(
+          NetLog::TYPE_BIDIRECTIONAL_STREAM_BYTES_SENT,
+          write_buffer_len_list_[i], write_buffer_list_[i]->data());
+    }
   }
   write_buffer_list_.clear();
   write_buffer_len_list_.clear();
   delegate_->OnDataSent();
 }
 
 void BidirectionalStream::OnTrailersReceived(const SpdyHeaderBlock& trailers) {
+  if (net_log_.IsCapturing()) {
+    net_log_.AddEvent(NetLog::TYPE_BIDIRECTIONAL_STREAM_RECV_TRAILERS,
+                      base::Bind(&NetLogHeadersCallback, &trailers));
+  }
   delegate_->OnTrailersReceived(trailers);
 }
 
 void BidirectionalStream::OnFailed(int status) {
   delegate_->OnFailed(status);
 }
 
 void BidirectionalStream::OnStreamReady(const SSLConfig& used_ssl_config,
                                         const ProxyInfo& used_proxy_info,
                                         HttpStream* stream) {
@@ skipping 62 matching lines @@
     const ProxyInfo& used_proxy_info,
     HttpStream* stream) {
   DCHECK(stream_request_);
 
   delegate_->OnFailed(ERR_HTTPS_PROXY_TUNNEL_RESPONSE);
 }
 
 void BidirectionalStream::OnQuicBroken() {}
 
 }  // namespace net