Repository: incubator-htrace Updated Branches: refs/heads/master 18b92a7a5 -> 0f873fdec
HTRACE-229. htrace-webapp needs to be updated to refer to "tracerid" not "processid" (cmccabe) Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/0f873fde Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/0f873fde Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/0f873fde Branch: refs/heads/master Commit: 0f873fdec0a5cc6fed93d57e535c51a586e977e2 Parents: 18b92a7 Author: Colin P. Mccabe <[email protected]> Authored: Mon Aug 24 16:14:57 2015 -0700 Committer: Colin P. Mccabe <[email protected]> Committed: Mon Aug 24 16:14:57 2015 -0700 ---------------------------------------------------------------------- htrace-webapp/src/main/web/app/predicate.js | 12 ++++++------ htrace-webapp/src/main/web/app/search_results_view.js | 2 +- htrace-webapp/src/main/web/index.html | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/0f873fde/htrace-webapp/src/main/web/app/predicate.js ---------------------------------------------------------------------- diff --git a/htrace-webapp/src/main/web/app/predicate.js b/htrace-webapp/src/main/web/app/predicate.js index e48b901..6526719 100644 --- a/htrace-webapp/src/main/web/app/predicate.js +++ b/htrace-webapp/src/main/web/app/predicate.js @@ -61,7 +61,7 @@ htrace.PType = Backbone.Model.extend({ return val; case "spanid": return htrace.normalizeSpanId(val); - case "processid": + case "tracerid": htrace.checkStringIsNotEmpty(val); return val; default: @@ -81,7 +81,7 @@ htrace.PType = Backbone.Model.extend({ return "0"; case "spanid": return ""; - case "processid": + case "tracerid": return ""; default: return "(unknown)"; @@ -109,10 +109,10 @@ htrace.parsePType = function(name) { return new htrace.PType({name: name, field:"duration", op:"le"}); case "Span ID is": return new htrace.PType({name: name, field:"spanid", op:"eq"}); - case "ProcessId contains": - return new htrace.PType({name: name, field:"processid", op:"cn"}); - case "ProcessId is exactly": - return new htrace.PType({name: name, field:"processid", op:"eq"}); + case "TracerId contains": + return new htrace.PType({name: name, field:"tracerid", op:"cn"}); + case "TracerId is exactly": + return new htrace.PType({name: name, field:"tracerid", op:"eq"}); default: return null } http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/0f873fde/htrace-webapp/src/main/web/app/search_results_view.js ---------------------------------------------------------------------- diff --git a/htrace-webapp/src/main/web/app/search_results_view.js b/htrace-webapp/src/main/web/app/search_results_view.js index 318b78d..b2fffbd 100644 --- a/htrace-webapp/src/main/web/app/search_results_view.js +++ b/htrace-webapp/src/main/web/app/search_results_view.js @@ -154,7 +154,7 @@ htrace.SearchResultsView = Backbone.View.extend({ // // 0 xB xD xS viewX // +--------------+----------+--------------------+-----------+ - // |ProcessId | Buttons | Span Description | Scrollbar | + // |TracerId | Buttons | Span Description | Scrollbar | // +--------------+----------+--------------------+-----------+ // setupCoordinates: function() { http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/0f873fde/htrace-webapp/src/main/web/index.html ---------------------------------------------------------------------- diff --git a/htrace-webapp/src/main/web/index.html b/htrace-webapp/src/main/web/index.html index 29a899b..ec28fe6 100644 --- a/htrace-webapp/src/main/web/index.html +++ b/htrace-webapp/src/main/web/index.html @@ -125,9 +125,9 @@ <li><a href="javascript:void(0)" class="add-field">Span ID is</a></li> <li><a href="javascript:void(0)" - class="add-field">ProcessId contains</a></li> + class="add-field">TracerId contains</a></li> <li><a href="javascript:void(0)" - class="add-field">ProcessId is exactly</a></li> + class="add-field">TracerId is exactly</a></li> </ul> </div> <button type="submit" class="btn btn-primary" id="searchButton">
