Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Side by Side Diff: components/cronet/android/cronet_url_request_adapter.cc

Issue 2360813003: [Cronet] Pass metrics information from C++ BidirectionalStream to Java (Closed)
Patch Set: Rebased Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/cronet/android/cronet_url_request_adapter.h" 5 #include "components/cronet/android/cronet_url_request_adapter.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "components/cronet/android/cronet_url_request_context_adapter.h" 14 #include "components/cronet/android/cronet_url_request_context_adapter.h"
15 #include "components/cronet/android/io_buffer_with_byte_buffer.h" 15 #include "components/cronet/android/io_buffer_with_byte_buffer.h"
16 #include "components/cronet/android/metrics_util.h"
16 #include "components/cronet/android/url_request_error.h" 17 #include "components/cronet/android/url_request_error.h"
17 #include "jni/CronetUrlRequest_jni.h" 18 #include "jni/CronetUrlRequest_jni.h"
18 #include "net/base/load_flags.h" 19 #include "net/base/load_flags.h"
19 #include "net/base/load_states.h" 20 #include "net/base/load_states.h"
20 #include "net/base/net_errors.h" 21 #include "net/base/net_errors.h"
21 #include "net/base/request_priority.h" 22 #include "net/base/request_priority.h"
22 #include "net/cert/cert_status_flags.h" 23 #include "net/cert/cert_status_flags.h"
23 #include "net/http/http_response_headers.h" 24 #include "net/http/http_response_headers.h"
24 #include "net/http/http_status_code.h" 25 #include "net/http/http_status_code.h"
25 #include "net/http/http_util.h" 26 #include "net/http/http_util.h"
26 #include "net/proxy/proxy_server.h" 27 #include "net/proxy/proxy_server.h"
27 #include "net/quic/core/quic_protocol.h" 28 #include "net/quic/core/quic_protocol.h"
28 #include "net/ssl/ssl_info.h" 29 #include "net/ssl/ssl_info.h"
29 #include "net/url_request/redirect_info.h" 30 #include "net/url_request/redirect_info.h"
30 #include "net/url_request/url_request_context.h" 31 #include "net/url_request/url_request_context.h"
31 32
32 using base::android::ConvertUTF8ToJavaString; 33 using base::android::ConvertUTF8ToJavaString;
33 using base::android::JavaParamRef; 34 using base::android::JavaParamRef;
34 35
35 namespace cronet { 36 namespace cronet {
36 37
37 namespace { 38 namespace {
38 39
39 // Converts timing metrics stored as TimeTicks into the format expected by the
40 // Java layer: ms since Unix epoch, or -1 for null
41 int64_t ConvertTime(const base::TimeTicks& ticks,
42 const base::TimeTicks& start_ticks,
43 const base::Time& start_time) {
44 if (ticks.is_null() || start_ticks.is_null()) {
45 return -1;
46 }
47 DCHECK(!start_time.is_null());
48 return (start_time + (ticks - start_ticks)).ToJavaTime();
49 }
50
51 // Returns the string representation of the HostPortPair of the proxy server 40 // Returns the string representation of the HostPortPair of the proxy server
52 // that was used to fetch the response. 41 // that was used to fetch the response.
53 std::string GetProxy(const net::HttpResponseInfo& info) { 42 std::string GetProxy(const net::HttpResponseInfo& info) {
54 if (!info.proxy_server.is_valid() || info.proxy_server.is_direct()) 43 if (!info.proxy_server.is_valid() || info.proxy_server.is_direct())
55 return net::HostPortPair().ToString(); 44 return net::HostPortPair().ToString();
56 return info.proxy_server.host_port_pair().ToString(); 45 return info.proxy_server.host_port_pair().ToString();
57 } 46 }
58 47
59 } // namespace 48 } // namespace
60 49
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 403
415 void CronetURLRequestAdapter::MaybeReportMetrics(JNIEnv* env) const { 404 void CronetURLRequestAdapter::MaybeReportMetrics(JNIEnv* env) const {
416 if (!enable_metrics_) { 405 if (!enable_metrics_) {
417 return; 406 return;
418 } 407 }
419 net::LoadTimingInfo metrics; 408 net::LoadTimingInfo metrics;
420 url_request_->GetLoadTimingInfo(&metrics); 409 url_request_->GetLoadTimingInfo(&metrics);
421 base::Time start_time = metrics.request_start_time; 410 base::Time start_time = metrics.request_start_time;
422 base::TimeTicks start_ticks = metrics.request_start; 411 base::TimeTicks start_ticks = metrics.request_start;
423 Java_CronetUrlRequest_onMetricsCollected( 412 Java_CronetUrlRequest_onMetricsCollected(
424 env, owner_.obj(), ConvertTime(start_ticks, start_ticks, start_time), 413 env, owner_.obj(),
425 ConvertTime(metrics.connect_timing.dns_start, start_ticks, start_time), 414 metrics_util::ConvertTime(start_ticks, start_ticks, start_time),
426 ConvertTime(metrics.connect_timing.dns_end, start_ticks, start_time), 415 metrics_util::ConvertTime(metrics.connect_timing.dns_start, start_ticks,
427 ConvertTime(metrics.connect_timing.connect_start, start_ticks, 416 start_time),
428 start_time), 417 metrics_util::ConvertTime(metrics.connect_timing.dns_end, start_ticks,
429 ConvertTime(metrics.connect_timing.connect_end, start_ticks, start_time), 418 start_time),
430 ConvertTime(metrics.connect_timing.ssl_start, start_ticks, start_time), 419 metrics_util::ConvertTime(metrics.connect_timing.connect_start,
431 ConvertTime(metrics.connect_timing.ssl_end, start_ticks, start_time), 420 start_ticks, start_time),
432 ConvertTime(metrics.send_start, start_ticks, start_time), 421 metrics_util::ConvertTime(metrics.connect_timing.connect_end, start_ticks,
433 ConvertTime(metrics.send_end, start_ticks, start_time), 422 start_time),
434 ConvertTime(metrics.push_start, start_ticks, start_time), 423 metrics_util::ConvertTime(metrics.connect_timing.ssl_start, start_ticks,
435 ConvertTime(metrics.push_end, start_ticks, start_time), 424 start_time),
436 ConvertTime(metrics.receive_headers_end, start_ticks, start_time), 425 metrics_util::ConvertTime(metrics.connect_timing.ssl_end, start_ticks,
437 ConvertTime(base::TimeTicks::Now(), start_ticks, start_time), 426 start_time),
427 metrics_util::ConvertTime(metrics.send_start, start_ticks, start_time),
428 metrics_util::ConvertTime(metrics.send_end, start_ticks, start_time),
429 metrics_util::ConvertTime(metrics.push_start, start_ticks, start_time),
430 metrics_util::ConvertTime(metrics.push_end, start_ticks, start_time),
431 metrics_util::ConvertTime(metrics.receive_headers_end, start_ticks,
432 start_time),
433 metrics_util::ConvertTime(base::TimeTicks::Now(), start_ticks,
434 start_time),
438 metrics.socket_reused, url_request_->GetTotalSentBytes(), 435 metrics.socket_reused, url_request_->GetTotalSentBytes(),
439 url_request_->GetTotalReceivedBytes()); 436 url_request_->GetTotalReceivedBytes());
440 } 437 }
441 438
442 net::URLRequest* CronetURLRequestAdapter::GetURLRequestForTesting() { 439 net::URLRequest* CronetURLRequestAdapter::GetURLRequestForTesting() {
443 return url_request_.get(); 440 return url_request_.get();
444 } 441 }
445 442
446 } // namespace cronet 443 } // namespace cronet
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698