OLD | NEW |
1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
2 <!-- | 2 <!-- |
3 Copyright 2017 The Chromium Authors. All rights reserved. | 3 Copyright 2017 The Chromium Authors. All rights reserved. |
4 Use of this source code is governed by a BSD-style license that can be | 4 Use of this source code is governed by a BSD-style license that can be |
5 found in the LICENSE file. | 5 found in the LICENSE file. |
6 --> | 6 --> |
7 | 7 |
8 <link rel="import" href="/tracing/base/utils.html"> | 8 <link rel="import" href="/tracing/base/utils.html"> |
9 <link rel="import" href="/tracing/core/test_utils.html"> | 9 <link rel="import" href="/tracing/core/test_utils.html"> |
10 <link rel="import" href="/tracing/value/histogram.html"> | 10 <link rel="import" href="/tracing/value/histogram.html"> |
(...skipping 24 matching lines...) Expand all Loading... |
35 thread.sliceGroup.pushSlice(bSlice); | 35 thread.sliceGroup.pushSlice(bSlice); |
36 }); | 36 }); |
37 assert.notEqual(aSlice.stableId, bSlice.stableId); | 37 assert.notEqual(aSlice.stableId, bSlice.stableId); |
38 | 38 |
39 const aHist = new tr.v.Histogram('a', tr.b.Unit.byName.count); | 39 const aHist = new tr.v.Histogram('a', tr.b.Unit.byName.count); |
40 const bHist = new tr.v.Histogram('b', tr.b.Unit.byName.count); | 40 const bHist = new tr.v.Histogram('b', tr.b.Unit.byName.count); |
41 | 41 |
42 aHist.diagnostics.set('events', new tr.v.d.RelatedEventSet(aSlice)); | 42 aHist.diagnostics.set('events', new tr.v.d.RelatedEventSet(aSlice)); |
43 bHist.diagnostics.set('events', new tr.v.d.RelatedEventSet(bSlice)); | 43 bHist.diagnostics.set('events', new tr.v.d.RelatedEventSet(bSlice)); |
44 | 44 |
45 new tr.v.d.TelemetryInfo({ | |
46 canonicalUrl: 'http://a', | |
47 }).addToHistogram(aHist); | |
48 | |
49 new tr.v.d.TelemetryInfo({ | |
50 canonicalUrl: 'http://b', | |
51 }).addToHistogram(bHist); | |
52 | |
53 let mergedHist = aHist.clone(); | 45 let mergedHist = aHist.clone(); |
54 mergedHist.addHistogram(bHist); | 46 mergedHist.addHistogram(bHist); |
55 mergedHist = tr.v.Histogram.fromDict(mergedHist.asDict()); | 47 mergedHist = tr.v.Histogram.fromDict(mergedHist.asDict()); |
56 | 48 |
57 const mergedEvents = mergedHist.diagnostics.get('events'); | 49 const mergedEvents = mergedHist.diagnostics.get('events'); |
58 const span = tr.v.ui.createDiagnosticSpan(mergedEvents); | 50 const span = tr.v.ui.createDiagnosticSpan(mergedEvents); |
59 assert.strictEqual( | 51 assert.strictEqual( |
60 'TR-V-UI-COLLECTED-RELATED-EVENT-SET-SPAN', span.tagName); | 52 'TR-V-UI-COLLECTED-RELATED-EVENT-SET-SPAN', span.tagName); |
61 this.addHTMLOutput(span); | 53 this.addHTMLOutput(span); |
62 }); | 54 }); |
63 }); | 55 }); |
64 </script> | 56 </script> |
OLD | NEW |