Merge branch 'exclude-server-fields-from-exceptions-log' into 'master'

Exclude extra.server fields from exceptions_json.log

See merge request gitlab-org/gitlab!32770

changelogs/unreleased/exclude-server-fields-from-exceptions-log.yml

+---
+title: Exclude extra.server fields from exceptions_json.log
+merge_request: 32770
+author:
+type: changed

doc/administration/logs.md

@@ -728,17 +728,6 @@ Each line contains a JSON line that can be ingested by Elasticsearch. For exampl
   "severity": "ERROR",
   "time": "2019-12-17T11:49:29.485Z",
   "correlation_id": "AbDVUrrTvM1",
-  "extra.server": {
-    "os": {
-      "name": "Darwin",
-      "version": "Darwin Kernel Version 19.2.0",
-      "build": "19.2.0",
-    },
-    "runtime": {
-      "name": "ruby",
-      "version": "ruby 2.6.5p114 (2019-10-01 revision 67812) [x86_64-darwin18]"
-    }
-  },
   "extra.project_id": 55,
   "extra.relation_key": "milestones",
   "extra.relation_index": 1,

lib/gitlab/exception_log_formatter.rb

@@ -12,6 +12,8 @@ module Gitlab
         'exception.message' => exception.message
       )
 
+      payload.delete('extra.server')
+
       if exception.backtrace
         payload['exception.backtrace'] = Gitlab::BacktraceCleaner.clean_backtrace(exception.backtrace)
       end