Index: tracing/tracing/metrics/system_health/responsiveness_metric.html |
diff --git a/tracing/tracing/metrics/system_health/responsiveness_metric.html b/tracing/tracing/metrics/system_health/responsiveness_metric.html |
index 5098c535277ddf12329cd935491e86ab4f80a017..84d713b611a8825a0d66cee92334c927906e568a 100644 |
--- a/tracing/tracing/metrics/system_health/responsiveness_metric.html |
+++ b/tracing/tracing/metrics/system_health/responsiveness_metric.html |
@@ -85,11 +85,11 @@ tr.exportTo('tr.metrics.sh', function() { |
model.userModel.expectations.forEach(function(ue) { |
if (opt_options && opt_options.rangeOfInterest && |
- !opt_options.rangeOfInterest.intersectsExplicitRangeExclusive( |
+ !opt_options.rangeOfInterest.intersectsExplicitRangeInclusive( |
ue.start, ue.end)) |
return; |
- var sourceInfo = {userExpectationId: ue.stableId}; |
+ var sampleDiagnostic = new tr.v.d.RelatedEventSet([ue]); |
// Responsiveness is not defined for Idle. |
if (ue instanceof tr.model.um.IdleExpectation) { |
@@ -97,27 +97,27 @@ tr.exportTo('tr.metrics.sh', function() { |
} else if (ue instanceof tr.model.um.LoadExpectation) { |
// This is already covered by firstPaintMetric. |
} else if (ue instanceof tr.model.um.ResponseExpectation) { |
- responseNumeric.add(ue.duration, sourceInfo); |
+ responseNumeric.add(ue.duration, sampleDiagnostic); |
} else if (ue instanceof tr.model.um.AnimationExpectation) { |
var throughput = computeAnimationThroughput(ue); |
if (throughput === undefined) |
throw new Error('Missing throughput for ' + |
ue.stableId); |
- throughputNumeric.add(throughput, sourceInfo); |
+ throughputNumeric.add(throughput, sampleDiagnostic); |
var frameTimeDiscrepancy = computeAnimationframeTimeDiscrepancy(ue); |
if (frameTimeDiscrepancy === undefined) |
throw new Error('Missing frameTimeDiscrepancy for ' + |
ue.stableId); |
- frameTimeDiscrepancyNumeric.add(frameTimeDiscrepancy, sourceInfo); |
+ frameTimeDiscrepancyNumeric.add(frameTimeDiscrepancy, sampleDiagnostic); |
ue.associatedEvents.forEach(function(event) { |
if (!(event instanceof tr.e.cc.InputLatencyAsyncSlice)) |
return; |
- latencyNumeric.add(event.duration, sourceInfo); |
+ latencyNumeric.add(event.duration, sampleDiagnostic); |
}); |
} else { |
throw new Error('Unrecognized stage for ' + ue.stableId); |