summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/performance_bar/components/detailed_metric.vue
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-04-17 13:07:59 +0000
committerSean McGivern <sean@gitlab.com>2019-04-17 13:07:59 +0000
commit3f3d2c066188acbe0724dc5cc24f0d57456ef6d6 (patch)
tree83ec6cbf9bb06a6f2fe2d3bebed01b74691f530a /app/assets/javascripts/performance_bar/components/detailed_metric.vue
parent351827065a66294e35ec19dfa03470b2bb66ec5d (diff)
parentfbb3fd1397c1304d424da404c226e4a4f9aa262b (diff)
downloadgitlab-ce-3f3d2c066188acbe0724dc5cc24f0d57456ef6d6.tar.gz
Merge branch 'sh-add-gitaly-backtrace' into 'master'
Add backtrace to Gitaly performance bar Closes #60092 See merge request gitlab-org/gitlab-ce!27345
Diffstat (limited to 'app/assets/javascripts/performance_bar/components/detailed_metric.vue')
-rw-r--r--app/assets/javascripts/performance_bar/components/detailed_metric.vue28
1 files changed, 26 insertions, 2 deletions
diff --git a/app/assets/javascripts/performance_bar/components/detailed_metric.vue b/app/assets/javascripts/performance_bar/components/detailed_metric.vue
index 19a81713964..8f3ba9779fb 100644
--- a/app/assets/javascripts/performance_bar/components/detailed_metric.vue
+++ b/app/assets/javascripts/performance_bar/components/detailed_metric.vue
@@ -1,9 +1,11 @@
<script>
import GlModal from '~/vue_shared/components/gl_modal.vue';
+import Icon from '~/vue_shared/components/icon.vue';
export default {
components: {
GlModal,
+ Icon,
},
props: {
currentRequest: {
@@ -61,9 +63,31 @@ export default {
<template v-if="detailsList.length">
<tr v-for="(item, index) in detailsList" :key="index">
<td>
- <strong>{{ item.duration }}ms</strong>
+ <span>{{ item.duration }}ms</span>
+ </td>
+ <td>
+ <div class="js-toggle-container">
+ <div
+ v-for="(key, keyIndex) in keys"
+ :key="key"
+ class="break-word"
+ :class="{ 'mb-3 bold': keyIndex == 0 }"
+ >
+ {{ item[key] }}
+ <button
+ v-if="keyIndex == 0 && item.backtrace"
+ class="text-expander js-toggle-button"
+ type="button"
+ :aria-label="__('Toggle backtrace')"
+ >
+ <icon :size="12" name="ellipsis_h" />
+ </button>
+ </div>
+ <pre v-if="item.backtrace" class="backtrace-row js-toggle-content mt-2">{{
+ item.backtrace
+ }}</pre>
+ </div>
</td>
- <td v-for="key in keys" :key="key" class="break-word">{{ item[key] }}</td>
</tr>
</template>
<template v-else>