Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/sh-disable-diff-instrumentation.yml

+---
+title: Disable method instrumentation for diffs
+merge_request: 27235
+author:
+type: performance

config/initializers/zz_metrics.rb

@@ -31,7 +31,6 @@ def instrument_classes(instrumentation)
     # are included.
     %w(app services [^concerns]**) => %w(app services),
     %w(lib gitlab conflicts)       => ['lib'],
-    %w(lib gitlab diff)            => ['lib'],
     %w(lib gitlab email message)   => ['lib'],
     %w(lib gitlab checks)          => ['lib']
   }