Merge branch 'bastianccm-master-patch-53163' into 'master'

Error Tracking: Fix collecting errors for golang

See merge request gitlab-org/gitlab!78199

app/validators/json_schemas/error_tracking_event_payload.json

@@ -13,12 +13,30 @@
       "type": "object"
     },
     "exception": {
+      "oneOf": [
+        {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/exception"
+          }
+        },
+        {
           "type": "object",
           "required": ["values"],
           "properties": {
             "values": {
               "type": "array",
               "items": {
+                "$ref": "#/definitions/exception"
+              }
+            }
+          }
+        }
+      ]
+    }
+  },
+  "definitions": {
+    "exception": {
       "type": "object",
       "required": [],
       "properties": {
@@ -70,7 +88,4 @@
       }
     }
   }
-      }
-    }
-  }
 }

spec/lib/error_tracking/collector/payload_validator_spec.rb

@@ -42,6 +42,12 @@ RSpec.describe ErrorTracking::Collector::PayloadValidator do
       it_behaves_like 'valid payload'
     end
 
+    context 'go payload' do
+      let(:payload) { Gitlab::Json.parse(fixture_file('error_tracking/go_parsed_event.json')) }
+
+      it_behaves_like 'valid payload'
+    end
+
     context 'empty payload' do
       let(:payload) { '' }