Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 5 insertions, 3 deletions

diff --git a/app/models/error_tracking/error_event.rb b/app/models/error_tracking/error_event.rb
index 686518a39fb..0b638f65768 100644
--- a/app/models/error_tracking/error_event.rb
+++ b/app/models/error_tracking/error_event.rb
@@ -6,7 +6,9 @@ class ErrorTracking::ErrorEvent < ApplicationRecord
   validates :payload, json_schema: { filename: 'error_tracking_event_payload' }
 
   validates :error, presence: true
-  validates :description, presence: true
+  validates :description, presence: true, length: { maximum: 1024 }
+  validates :level, length: { maximum: 255 }
+  validates :environment, length: { maximum: 255 }
   validates :occurred_at, presence: true
 
   def stacktrace
@@ -61,9 +63,9 @@ class ErrorTracking::ErrorEvent < ApplicationRecord
     pre_context = entry['pre_context']
     post_context = entry['post_context']
 
-    context += lines_with_position(pre_context, error_line_no - pre_context.size)
+    context += lines_with_position(pre_context, error_line_no - pre_context.size) if pre_context
     context += lines_with_position([error_line], error_line_no)
-    context += lines_with_position(post_context, error_line_no + 1)
+    context += lines_with_position(post_context, error_line_no + 1) if post_context
 
     context.reject(&:blank?)
   end