Merge branch '45406-error-getting-performance-bar-results-for-uuid-regularly-seen-in-production' into 'master'
Resolve ""Error getting performance bar results for [UUID]" regularly seen in production" Closes #45406 See merge request gitlab-org/gitlab-ce!18419
This commit is contained in:
commit
7d200b6c2a
2 changed files with 14 additions and 18 deletions
|
@ -10,29 +10,25 @@ export default class PerformanceBarService {
|
|||
}
|
||||
|
||||
static registerInterceptor(peekUrl, callback) {
|
||||
vueResourceInterceptor = (request, next) => {
|
||||
next(response => {
|
||||
const requestId = response.headers['x-request-id'];
|
||||
const requestUrl = response.url;
|
||||
|
||||
if (requestUrl !== peekUrl && requestId) {
|
||||
callback(requestId, requestUrl);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
Vue.http.interceptors.push(vueResourceInterceptor);
|
||||
|
||||
return axios.interceptors.response.use(response => {
|
||||
const interceptor = response => {
|
||||
const requestId = response.headers['x-request-id'];
|
||||
const requestUrl = response.config.url;
|
||||
// Get the request URL from response.config for Axios, and response for
|
||||
// Vue Resource.
|
||||
const requestUrl = (response.config || response).url;
|
||||
const cachedResponse = response.headers['x-gitlab-from-cache'] === 'true';
|
||||
|
||||
if (requestUrl !== peekUrl && requestId) {
|
||||
if (requestUrl !== peekUrl && requestId && !cachedResponse) {
|
||||
callback(requestId, requestUrl);
|
||||
}
|
||||
|
||||
return response;
|
||||
});
|
||||
};
|
||||
|
||||
vueResourceInterceptor = (request, next) => next(interceptor);
|
||||
|
||||
Vue.http.interceptors.push(vueResourceInterceptor);
|
||||
|
||||
return axios.interceptors.response.use(interceptor);
|
||||
}
|
||||
|
||||
static removeInterceptor(interceptor) {
|
||||
|
|
|
@ -50,7 +50,7 @@ module Gitlab
|
|||
|
||||
status_code = Gitlab::PollingInterval.polling_enabled? ? 304 : 429
|
||||
|
||||
[status_code, { 'ETag' => etag }, []]
|
||||
[status_code, { 'ETag' => etag, 'X-Gitlab-From-Cache' => 'true' }, []]
|
||||
end
|
||||
|
||||
def track_cache_miss(if_none_match, cached_value_present, route)
|
||||
|
|
Loading…
Reference in a new issue