Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

2 files changed, 52 insertions, 19 deletions

diff --git a/lib/gitlab/etag_caching/middleware.rb b/lib/gitlab/etag_caching/middleware.rb
index 303e1a23e6b..fc3c05c57b2 100644
--- a/lib/gitlab/etag_caching/middleware.rb
+++ b/lib/gitlab/etag_caching/middleware.rb
@@ -3,6 +3,14 @@
 module Gitlab
   module EtagCaching
     class Middleware
+      SKIP_HEADER_KEY = 'X-Gitlab-Skip-Etag'
+
+      class << self
+        def skip!(response)
+          response.set_header(SKIP_HEADER_KEY, '1')
+        end
+      end
+
       def initialize(app)
         @app = app
       end
@@ -22,9 +30,7 @@ module Gitlab
         else
           track_cache_miss(if_none_match, cached_value_present, route)
 
-          status, headers, body = @app.call(env)
-          headers['ETag'] = etag
-          [status, headers, body]
+          maybe_apply_etag(etag, *@app.call(env))
         end
       end
 
@@ -43,6 +49,13 @@ module Gitlab
         [weak_etag_format(current_value), cached_value_present]
       end
 
+      def maybe_apply_etag(etag, status, headers, body)
+        headers['ETag'] = etag unless
+          Gitlab::Utils.to_boolean(headers.delete(SKIP_HEADER_KEY))
+
+        [status, headers, body]
+      end
+
       def weak_etag_format(value)
         %Q{W/"#{value}"}
       end
@@ -54,7 +67,13 @@ module Gitlab
 
         add_instrument_for_cache_hit(status_code, route, request)
 
-        [status_code, { 'ETag' => etag, 'X-Gitlab-From-Cache' => 'true' }, []]
+        new_headers = {
+          'ETag' => etag,
+          'X-Gitlab-From-Cache' => 'true',
+          ::Gitlab::Metrics::RequestsRackMiddleware::FEATURE_CATEGORY_HEADER => route.feature_category
+        }
+
+        [status_code, new_headers, []]
       end
 
       def track_cache_miss(if_none_match, cached_value_present, route)
diff --git a/lib/gitlab/etag_caching/router.rb b/lib/gitlab/etag_caching/router.rb
index 17d9cf08367..769ac2784d1 100644
--- a/lib/gitlab/etag_caching/router.rb
+++ b/lib/gitlab/etag_caching/router.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module EtagCaching
     class Router
-      Route = Struct.new(:regexp, :name)
+      Route = Struct.new(:regexp, :name, :feature_category)
       # We enable an ETag for every request matching the regex.
       # To match a regex the path needs to match the following:
       #   - Don't contain a reserved word (expect for the words used in the
@@ -20,59 +20,73 @@ module Gitlab
       ROUTES = [
         Gitlab::EtagCaching::Router::Route.new(
           %r(#{RESERVED_WORDS_PREFIX}/noteable/issue/\d+/notes\z),
-          'issue_notes'
+          'issue_notes',
+          'issue_tracking'
         ),
         Gitlab::EtagCaching::Router::Route.new(
           %r(#{RESERVED_WORDS_PREFIX}/noteable/merge_request/\d+/notes\z),
-          'merge_request_notes'
+          'merge_request_notes',
+          'code_review'
         ),
         Gitlab::EtagCaching::Router::Route.new(
           %r(#{RESERVED_WORDS_PREFIX}/issues/\d+/realtime_changes\z),
-          'issue_title'
+          'issue_title',
+          'issue_tracking'
         ),
         Gitlab::EtagCaching::Router::Route.new(
           %r(#{RESERVED_WORDS_PREFIX}/commit/\S+/pipelines\.json\z),
-          'commit_pipelines'
+          'commit_pipelines',
+          'continuous_integration'
         ),
         Gitlab::EtagCaching::Router::Route.new(
           %r(#{RESERVED_WORDS_PREFIX}/merge_requests/new\.json\z),
-          'new_merge_request_pipelines'
+          'new_merge_request_pipelines',
+          'continuous_integration'
         ),
         Gitlab::EtagCaching::Router::Route.new(
           %r(#{RESERVED_WORDS_PREFIX}/merge_requests/\d+/pipelines\.json\z),
-          'merge_request_pipelines'
+          'merge_request_pipelines',
+          'continuous_integration'
         ),
         Gitlab::EtagCaching::Router::Route.new(
           %r(#{RESERVED_WORDS_PREFIX}/pipelines\.json\z),
-          'project_pipelines'
+          'project_pipelines',
+          'continuous_integration'
         ),
         Gitlab::EtagCaching::Router::Route.new(
           %r(#{RESERVED_WORDS_PREFIX}/pipelines/\d+\.json\z),
-          'project_pipeline'
+          'project_pipeline',
+          'continuous_integration'
         ),
         Gitlab::EtagCaching::Router::Route.new(
           %r(#{RESERVED_WORDS_PREFIX}/builds/\d+\.json\z),
-          'project_build'
+          'project_build',
+          'continuous_integration'
         ),
         Gitlab::EtagCaching::Router::Route.new(
           %r(#{RESERVED_WORDS_PREFIX}/clusters/\d+/environments\z),
-          'cluster_environments'
+          'cluster_environments',
+          'continuous_delivery'
         ),
         Gitlab::EtagCaching::Router::Route.new(
           %r(#{RESERVED_WORDS_PREFIX}/environments\.json\z),
-          'environments'
+          'environments',
+          'continuous_delivery'
         ),
         Gitlab::EtagCaching::Router::Route.new(
           %r(#{RESERVED_WORDS_PREFIX}/import/github/realtime_changes\.json\z),
-          'realtime_changes_import_github'
+          'realtime_changes_import_github',
+          'importers'
         ),
         Gitlab::EtagCaching::Router::Route.new(
           %r(#{RESERVED_WORDS_PREFIX}/import/gitea/realtime_changes\.json\z),
-          'realtime_changes_import_gitea'
+          'realtime_changes_import_gitea',
+          'importers'
         ),
         Gitlab::EtagCaching::Router::Route.new(
           %r(#{RESERVED_WORDS_PREFIX}/merge_requests/\d+/cached_widget\.json\z),
-          'merge_request_widget'
+          'merge_request_widget',
+          'code_review'
         )
       ].freeze