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

Misc finatra fixes #80

Closed
wants to merge 2 commits into from
Closed

Misc finatra fixes #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfbf54c
Fix span details modal on static trace page, remove unnecessary code
Jul 23, 2012
2ce7618
Sort annotations when dumping to json
Jul 23, 2012
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
10 changes: 0 additions & 10 deletions zipkin-finatra/src/main/resources/templates/show.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,6 @@
<div id="annotation-modal" class="trace-desc-body annotation-list modal">
</div>

<div class="modal hide" id="export-trace-modal">
<div class="modal-header">
<a class="close" data-dismiss="modal" href="#export-trace-modal">×</a>
<h3>Keep this JSON data somewhere safe</h3>
</div>
<div class="modal-body">
<p id="export-trace-data"></p>
</div>
</div>

<script type="text/javascript">
$(document).ready(function() {
{{inlineJs}}
Expand Down
3 changes: 3 additions & 0 deletions zipkin-finatra/src/main/resources/templates/static.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
</div>
</div>

<div id="annotation-modal" class="trace-desc-body annotation-list modal">
</div>

<script type="text/javascript">
$(document).ready(function() {
{{inlineJs}}
Expand Down
2 changes: 1 addition & 1 deletion zipkin-finatra/src/main/scala/com/twitter/zipkin/adapter/JsonAdapter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ object JsonAdapter extends Adapter {
s.serviceNames,
s.firstAnnotation.get.timestamp,
s.duration.get,
s.annotations,
s.annotations.sortWith((a,b) => a.timestamp < b.timestamp),
s.binaryAnnotations.map(JsonAdapter(_)))
}

Expand Down