Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

2 files changed, 10 insertions, 2 deletions

diff --git a/app/services/error_tracking/base_service.rb b/app/services/error_tracking/base_service.rb
index 289c125b9d1..598621f70e1 100644
--- a/app/services/error_tracking/base_service.rb
+++ b/app/services/error_tracking/base_service.rb
@@ -1,7 +1,13 @@
 # frozen_string_literal: true
 
 module ErrorTracking
-  class BaseService < ::BaseService
+  class BaseService < ::BaseProjectService
+    include Gitlab::Utils::UsageData
+
+    def initialize(project, user = nil, params = {})
+      super(project: project, current_user: user, params: params.dup)
+    end
+
     def execute
       return unauthorized if unauthorized
 
@@ -21,6 +27,8 @@ module ErrorTracking
 
       yield if block_given?
 
+      track_usage_event(params[:tracking_event], current_user.id) if params[:tracking_event]
+
       success(parse_response(response))
     end
 
diff --git a/app/services/error_tracking/collect_error_service.rb b/app/services/error_tracking/collect_error_service.rb
index 50508c9810a..6376b743255 100644
--- a/app/services/error_tracking/collect_error_service.rb
+++ b/app/services/error_tracking/collect_error_service.rb
@@ -60,7 +60,7 @@ module ErrorTracking
     end
 
     def actor
-      return event['transaction'] if event['transaction']
+      return event['transaction'] if event['transaction'].present?
 
       # Some SDKs do not have a transaction attribute.
       # So we build it by combining function name and module name from