Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Redesign Trace Timeline #2736

Merged
merged 89 commits into from
Oct 21, 2019
Merged

Redesign Trace Timeline #2736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
2ec84f2
Add TraceTimeline
tacigar Aug 3, 2019
3f690f3
Update css
tacigar Aug 3, 2019
69dfa0e
Set offset for tree rendering
tacigar Aug 4, 2019
b3eda10
Add TraceTree
tacigar Aug 5, 2019
29b05c4
Add SpanDetail
tacigar Aug 5, 2019
8a4b9ca
Enable to click span row
tacigar Aug 5, 2019
efbeaaa
Add expand button
tacigar Aug 5, 2019
8b7fbc1
Add expand buttons
tacigar Aug 5, 2019
ee9b960
Implement expand button
tacigar Aug 6, 2019
f1f7f40
Fix css bug
tacigar Aug 6, 2019
7b21001
Add TraceTimelineHeader
tacigar Aug 6, 2019
4f489d2
Add duration info to TraceTimeline
tacigar Aug 6, 2019
63e61f9
Add MiniMap
tacigar Aug 9, 2019
78c58f8
Update SpanAnnotation design
tacigar Aug 15, 2019
ddef53c
Improve UX of Annotation
tacigar Aug 15, 2019
ebba749
makeStyles -> withStyles
tacigar Aug 15, 2019
78c4592
Add unit tests for SpanAnnotation
tacigar Aug 15, 2019
ac75314
Add testing-library/jest-dom/extend-expect
tacigar Aug 15, 2019
6f85c03
Add unit tests for SpanAnnotations
tacigar Aug 15, 2019
304d0a9
Add unit tests for SpanTags
tacigar Aug 15, 2019
0d2bcdb
Update unit tests for SpanAnnotation
tacigar Aug 15, 2019
09c3aa6
Add unit tests for SpanDetail
tacigar Aug 15, 2019
11ff7fc
Unuse TraceMiniMap
tacigar Aug 15, 2019
a4ce2f8
makeStyles -> withStyles
tacigar Aug 16, 2019
0e35170
Refactor TimeMarker
tacigar Aug 16, 2019
767b44a
Add unit tests for TimeMarker
tacigar Aug 16, 2019
22b17f9
Add unit tests for TraceTimelineHeader
tacigar Aug 16, 2019
81c96ba
Refactor and Simplify TraceTimeline
tacigar Aug 16, 2019
27f67c7
Remove unused code
tacigar Aug 16, 2019
57ace80
Add key props to elements of TraceTree
tacigar Aug 19, 2019
f7b9b26
Change timestamp format of annotation
tacigar Aug 19, 2019
6574c50
Refactor SpanDetail
tacigar Aug 19, 2019
bef72be
Add some comments
tacigar Aug 19, 2019
c628591
Fix SpanAnnotation bug
tacigar Aug 19, 2019
afb46ea
Remove TraceMiniMap
tacigar Aug 19, 2019
fb9fe8b
Refactor TraceTree a little
tacigar Aug 19, 2019
f6009e3
Use theme.spacing for table cell padding
tacigar Sep 17, 2019
54caf11
Update handleSpanToggleButtonClick
tacigar Sep 17, 2019
a9491dc
Refactor TraceTree
tacigar Sep 17, 2019
57941de
Reroot trace tree when a span is clicked twice
tacigar Sep 24, 2019
883aec2
Disable reroot feature if the trace does not have a root span
tacigar Sep 24, 2019
917f282
Refactor TraceSummary and TraceTimeline
tacigar Sep 26, 2019
befe92d
Implement reset-reroot button
tacigar Sep 26, 2019
608428f
Change background color of the span row which is focused
tacigar Sep 26, 2019
cf7c14b
Zoom up when rerooted
tacigar Sep 26, 2019
5df8b9e
Set minimum valud for span's bar width
tacigar Sep 26, 2019
6775b9e
Give default value span bar's width
tacigar Sep 26, 2019
b92fb1a
Add right margin for timeline
tacigar Sep 26, 2019
61f3cd3
Update comments
tacigar Sep 27, 2019
5543f4b
Fix bugs of reroot feature
tacigar Sep 27, 2019
1d7773c
Open and close span detail
tacigar Sep 27, 2019
6a5b1f7
Implement Expand/Collapse buttons
tacigar Sep 27, 2019
61b38cc
Fix detailed span prop type
tacigar Sep 27, 2019
2fea74e
Fix a bug related to span with the same annotation value
tacigar Sep 27, 2019
d8a4cef
Fix bugs of duplicated key of annotations
tacigar Sep 27, 2019
b6be6f3
Fix bugs of duplicated key of tags
tacigar Sep 27, 2019
e7f292c
Fix unit test a bit
tacigar Sep 27, 2019
c768196
Fix up-control bombs bug
tacigar Sep 30, 2019
69993bb
Don't change the span bar width when collapse/expand spans
tacigar Sep 30, 2019
1549eb8
Avoid re-rendering trace timeline if not needed
tacigar Oct 1, 2019
78c4613
<React.Fragment> -> <>
tacigar Oct 1, 2019
1289126
Rename formatTimestampMillis to formatTimestampMicros
tacigar Oct 1, 2019
1ba74b7
TMP
tacigar Oct 2, 2019
4b1fb78
Implement service name badges
tacigar Oct 2, 2019
ead555f
Implement bar
tacigar Oct 2, 2019
feddb37
Change text position
tacigar Oct 3, 2019
ad08176
Fix service name badge position
tacigar Oct 3, 2019
d8c1bf6
Fix timeMarker's position
tacigar Oct 3, 2019
fb33ab2
Fix disabled collapse/expand button bugs
tacigar Oct 3, 2019
0870e4c
Refactor
tacigar Oct 3, 2019
fe8c791
Remove unnecessary lines
tacigar Oct 3, 2019
09b04e6
Partial import lodash
tacigar Oct 4, 2019
7e355cb
Open span detail when span clicked
tacigar Oct 4, 2019
6acd0f8
Don't show reroot button if the trace is not rerooted
tacigar Oct 4, 2019
7360d82
Unreroot when the current root span is doulbe-clicked
tacigar Oct 4, 2019
226a3f6
Add key props
tacigar Oct 4, 2019
871f41d
Swap + and -
tacigar Oct 4, 2019
90edc6f
Remove unused files
tacigar Oct 4, 2019
0c608fe
Add timemarker to timeline
tacigar Oct 4, 2019
bd6fa74
Remove opacity
tacigar Oct 4, 2019
8c843eb
Merge package-lock.json
tacigar Oct 4, 2019
d4298d6
Don't write colors directly on DOM elements
tacigar Oct 4, 2019
fc6723a
Simplify styling
tacigar Oct 21, 2019
6d38ebf
Use React.memo in TracePage
tacigar Oct 21, 2019
13ebb34
Enhance readability
tacigar Oct 21, 2019
8540b20
Reset reroot -> Reset root
tacigar Oct 21, 2019
3848bb1
Show root span ID
tacigar Oct 21, 2019
7452dfe
Reduce props warning
tacigar Oct 21, 2019
bb9e746
Fix bug
tacigar Oct 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 109 additions & 0 deletions zipkin-lens/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions zipkin-lens/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"@babel/preset-env": "^7.5.4",
"@babel/preset-react": "^7.0.0",
"@fortawesome/fontawesome-free": "^5.4.1",
"@testing-library/jest-dom": "^4.0.0",
"@testing-library/react": "^8.0.8",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^24.8.0",
Expand Down
21 changes: 0 additions & 21 deletions zipkin-lens/scss/components/_mini-timeline-graph.scss
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions zipkin-lens/scss/components/_mini-timeline-label.scss
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions zipkin-lens/scss/components/_mini-timeline.scss
View file
Open in desktop

This file was deleted.

72 changes: 0 additions & 72 deletions zipkin-lens/scss/components/_timeline-header.scss
View file
Open in desktop

This file was deleted.

84 changes: 0 additions & 84 deletions zipkin-lens/scss/components/_timeline-span-data.scss
View file
Open in desktop

This file was deleted.

Loading