diff options
Diffstat (limited to 'app/services/web_hook_service.rb')
| -rw-r--r-- | app/services/web_hook_service.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/services/web_hook_service.rb b/app/services/web_hook_service.rb index 27b29feed50..035f1754cbb 100644 --- a/app/services/web_hook_service.rb +++ b/app/services/web_hook_service.rb @@ -83,13 +83,13 @@ class WebHookService log_execution( response: response, - execution_duration: Gitlab::Metrics::System.monotonic_time - start_time + execution_duration: ::Gitlab::Metrics::System.monotonic_time - start_time ) ServiceResponse.success(message: response.body, payload: { http_status: response.code }) rescue *Gitlab::HTTP::HTTP_ERRORS, Gitlab::Json::LimitedEncoder::LimitExceeded, URI::InvalidURIError => e - execution_duration = Gitlab::Metrics::System.monotonic_time - start_time + execution_duration = ::Gitlab::Metrics::System.monotonic_time - start_time error_message = e.to_s log_execution( @@ -110,10 +110,10 @@ class WebHookService break log_recursion_blocked if recursion_blocked? params = { - recursion_detection_request_uuid: Gitlab::WebHooks::RecursionDetection::UUID.instance.request_uuid + "recursion_detection_request_uuid" => Gitlab::WebHooks::RecursionDetection::UUID.instance.request_uuid }.compact - WebHookWorker.perform_async(hook.id, data, hook_name, params) + WebHookWorker.perform_async(hook.id, data.deep_stringify_keys, hook_name.to_s, params) end end @@ -170,7 +170,9 @@ class WebHookService def queue_log_execution_with_retry(log_data, category) retried = false begin - ::WebHooks::LogExecutionWorker.perform_async(hook.id, log_data, category, uniqueness_token) + ::WebHooks::LogExecutionWorker.perform_async( + hook.id, log_data.deep_stringify_keys, category.to_s, uniqueness_token.to_s + ) rescue Gitlab::SidekiqMiddleware::SizeLimiter::ExceedLimitError raise if retried |