diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-02-11 08:49:20 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-02-11 08:49:20 +0000 |
| commit | 25af9032750c215860829fecb196da1e1c5ace6b (patch) | |
| tree | 63519a0a28314d34bdd25096b5297961bf4791cc /app | |
| parent | c71c50e45f921c3f6b7360bb5992dbabba83cf0e (diff) | |
| parent | 48bcd5248f6c1e8471393fe07ed043c4fefcb7e2 (diff) | |
| download | gitlab-ce-25af9032750c215860829fecb196da1e1c5ace6b.tar.gz | |
Merge branch 'an-peek-jaeger' into 'master'
Provide a performance bar link to the Jaeger UI
See merge request gitlab-org/gitlab-ce!24902
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/performance_bar/components/performance_bar_app.vue | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue index 74faa35358d..1ec2784cc5a 100644 --- a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue +++ b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue @@ -134,6 +134,13 @@ export default { >ms / <span title="Invoke Count">{{ currentRequest.details.gc.invokes }}</span> gc </span> </div> + <div + v-if="currentRequest.details && currentRequest.details.tracing" + id="peek-view-trace" + class="view" + > + <a :href="currentRequest.details.tracing.tracing_url"> trace </a> + </div> <request-selector v-if="currentRequest" :current-request="currentRequest" |