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

Makes it possible to display annotations who are a json value #1307

Merged
merged 1 commit into from
Sep 21, 2016
Merged

Makes it possible to display annotations who are a json value #1307

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion zipkin-ui/js/component_ui/spanPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ export default component(function spanPanel() {
}
$row.find('td').each(function() {
const $this = $(this);
$this.text(anno[$this.data('key')]);
const maybeObject = anno[$this.data('key')];
// In case someone is storing escaped json as an annotation value
// TODO: this class is not testable at the moment
$this.text($.type(maybeObject) === 'object' ? JSON.stringify(maybeObject) : maybeObject);
});
$annoBody.append($row);
});
Expand Down