sqreen 1.22.0 → 1.24.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +25 -0
- data/bin/sqreen +43 -0
- data/lib/sqreen/actions.rb +1 -1
- data/lib/sqreen/actions/actions_index.rb +5 -1
- data/lib/sqreen/actions/base.rb +1 -1
- data/lib/sqreen/actions/block_ip.rb +1 -1
- data/lib/sqreen/actions/block_user.rb +1 -1
- data/lib/sqreen/actions/ip_range_indexed_action_class.rb +1 -1
- data/lib/sqreen/actions/ip_ranges_index.rb +1 -1
- data/lib/sqreen/actions/redirect_ip.rb +1 -1
- data/lib/sqreen/actions/redirect_user.rb +1 -1
- data/lib/sqreen/actions/repository.rb +1 -1
- data/lib/sqreen/actions/unknown_action_type.rb +1 -1
- data/lib/sqreen/actions/user_action_class.rb +1 -1
- data/lib/sqreen/actions/users_index.rb +5 -1
- data/lib/sqreen/agent_message.rb +5 -0
- data/lib/sqreen/aggregated_metric.rb +5 -0
- data/lib/sqreen/attack_blocked.rb +1 -1
- data/lib/sqreen/binding_accessor.rb +1 -1
- data/lib/sqreen/binding_accessor/path_elem.rb +1 -1
- data/lib/sqreen/binding_accessor/transforms.rb +1 -1
- data/lib/sqreen/call_countable.rb +1 -1
- data/lib/sqreen/capped_queue.rb +1 -1
- data/lib/sqreen/cb.rb +1 -1
- data/lib/sqreen/condition_evaluator.rb +1 -1
- data/lib/sqreen/conditionable.rb +1 -1
- data/lib/sqreen/configuration.rb +2 -0
- data/lib/sqreen/context.rb +1 -1
- data/lib/sqreen/default_cb.rb +1 -1
- data/lib/sqreen/deferred_logger.rb +1 -1
- data/lib/sqreen/deliveries.rb +1 -1
- data/lib/sqreen/deliveries/batch.rb +1 -1
- data/lib/sqreen/deliveries/simple.rb +1 -1
- data/lib/sqreen/dependency.rb +1 -1
- data/lib/sqreen/dependency/new_relic.rb +1 -1
- data/lib/sqreen/deprecation.rb +1 -1
- data/lib/sqreen/ecosystem.rb +5 -0
- data/lib/sqreen/ecosystem/databases/database_connection_data.rb +5 -0
- data/lib/sqreen/ecosystem/databases/mongo.rb +5 -0
- data/lib/sqreen/ecosystem/databases/mysql.rb +5 -0
- data/lib/sqreen/ecosystem/databases/postgres.rb +5 -0
- data/lib/sqreen/ecosystem/databases/redis.rb +5 -0
- data/lib/sqreen/ecosystem/dispatch_table.rb +5 -0
- data/lib/sqreen/ecosystem/exception_reporting.rb +5 -0
- data/lib/sqreen/ecosystem/http/net_http.rb +5 -0
- data/lib/sqreen/ecosystem/http/rack_request.rb +5 -0
- data/lib/sqreen/ecosystem/loggable.rb +5 -0
- data/lib/sqreen/ecosystem/messaging/bunny.rb +5 -0
- data/lib/sqreen/ecosystem/messaging/kafka.rb +5 -0
- data/lib/sqreen/ecosystem/messaging/kinesis.rb +5 -0
- data/lib/sqreen/ecosystem/messaging/sqs.rb +5 -0
- data/lib/sqreen/ecosystem/module_api.rb +5 -0
- data/lib/sqreen/ecosystem/module_api/event_listener.rb +5 -0
- data/lib/sqreen/ecosystem/module_api/instrumentation.rb +5 -0
- data/lib/sqreen/ecosystem/module_api/message_producer.rb +5 -0
- data/lib/sqreen/ecosystem/module_api/signal_producer.rb +5 -0
- data/lib/sqreen/ecosystem/module_api/tracing.rb +5 -0
- data/lib/sqreen/ecosystem/module_api/tracing/client_data.rb +5 -0
- data/lib/sqreen/ecosystem/module_api/tracing/consumer_data.rb +5 -0
- data/lib/sqreen/ecosystem/module_api/tracing/messaging_data.rb +5 -0
- data/lib/sqreen/ecosystem/module_api/tracing/producer_data.rb +5 -0
- data/lib/sqreen/ecosystem/module_api/tracing/server_data.rb +5 -0
- data/lib/sqreen/ecosystem/module_api/tracing_id_generation.rb +5 -0
- data/lib/sqreen/ecosystem/module_api/transaction_storage.rb +5 -0
- data/lib/sqreen/ecosystem/module_registry.rb +5 -0
- data/lib/sqreen/ecosystem/tracing/modules/client.rb +5 -0
- data/lib/sqreen/ecosystem/tracing/modules/consumer.rb +5 -0
- data/lib/sqreen/ecosystem/tracing/modules/determine_ip.rb +5 -0
- data/lib/sqreen/ecosystem/tracing/modules/producer.rb +5 -0
- data/lib/sqreen/ecosystem/tracing/modules/server.rb +5 -0
- data/lib/sqreen/ecosystem/tracing/sampler.rb +5 -0
- data/lib/sqreen/ecosystem/tracing/sampling_configuration.rb +5 -0
- data/lib/sqreen/ecosystem/tracing/signals/tracing_client.rb +5 -0
- data/lib/sqreen/ecosystem/tracing/signals/tracing_consumer.rb +5 -0
- data/lib/sqreen/ecosystem/tracing/signals/tracing_producer.rb +5 -0
- data/lib/sqreen/ecosystem/tracing/signals/tracing_server.rb +5 -0
- data/lib/sqreen/ecosystem/tracing_broker.rb +5 -0
- data/lib/sqreen/ecosystem/tracing_id_setup.rb +5 -0
- data/lib/sqreen/ecosystem/transaction_storage.rb +5 -0
- data/lib/sqreen/ecosystem/util/call_writers_from_init.rb +5 -0
- data/lib/sqreen/ecosystem_integration.rb +5 -0
- data/lib/sqreen/ecosystem_integration/around_callbacks.rb +5 -0
- data/lib/sqreen/ecosystem_integration/instrumentation_service.rb +5 -0
- data/lib/sqreen/ecosystem_integration/request_lifecycle_tracking.rb +5 -0
- data/lib/sqreen/ecosystem_integration/signal_consumption.rb +6 -8
- data/lib/sqreen/endpoint_testing.rb +5 -0
- data/lib/sqreen/error_handling_middleware.rb +1 -1
- data/lib/sqreen/event.rb +1 -1
- data/lib/sqreen/events/attack.rb +9 -1
- data/lib/sqreen/events/remote_exception.rb +1 -1
- data/lib/sqreen/events/request_record.rb +1 -1
- data/lib/sqreen/exception.rb +1 -1
- data/lib/sqreen/formatter_with_tid.rb +1 -1
- data/lib/sqreen/framework_cb.rb +1 -1
- data/lib/sqreen/frameworks/generic.rb +18 -1
- data/lib/sqreen/frameworks/sqreen_test.rb +1 -1
- data/lib/sqreen/graft.rb +1 -1
- data/lib/sqreen/graft/call.rb +1 -1
- data/lib/sqreen/graft/callback.rb +1 -1
- data/lib/sqreen/graft/hook.rb +8 -294
- data/lib/sqreen/graft/hook.ruby_2.rb +305 -0
- data/lib/sqreen/graft/hook.ruby_3.rb +305 -0
- data/lib/sqreen/graft/hook_point.rb +7 -7
- data/lib/sqreen/graft/hook_point.ruby_2.rb +18 -0
- data/lib/sqreen/graft/hook_point.ruby_3.rb +19 -0
- data/lib/sqreen/graft/hook_point_error.rb +1 -1
- data/lib/sqreen/invalid_signature_exception.rb +1 -1
- data/lib/sqreen/js.rb +1 -1
- data/lib/sqreen/js/call_context.rb +1 -1
- data/lib/sqreen/js/context_pool.rb +8 -6
- data/lib/sqreen/js/exec_js_runnable.rb +1 -1
- data/lib/sqreen/js/execjs_adapter.rb +1 -1
- data/lib/sqreen/js/executable_js.rb +1 -1
- data/lib/sqreen/js/js_service_adapter.rb +1 -1
- data/lib/sqreen/js/mini_racer_adapter.rb +2 -1
- data/lib/sqreen/js/mini_racer_executable_js.rb +2 -0
- data/lib/sqreen/js/thread_local_exec_js_runnable.rb +1 -1
- data/lib/sqreen/legacy.rb +1 -1
- data/lib/sqreen/log/loggable.rb +1 -1
- data/lib/sqreen/logger.rb +1 -1
- data/lib/sqreen/metrics.rb +1 -1
- data/lib/sqreen/metrics/average.rb +1 -1
- data/lib/sqreen/metrics/base.rb +1 -1
- data/lib/sqreen/metrics/binning.rb +1 -1
- data/lib/sqreen/metrics/collect.rb +1 -1
- data/lib/sqreen/metrics/sum.rb +1 -1
- data/lib/sqreen/metrics_store.rb +1 -1
- data/lib/sqreen/metrics_store/already_registered_metric.rb +1 -1
- data/lib/sqreen/metrics_store/unknown_metric.rb +1 -1
- data/lib/sqreen/metrics_store/unregistered_metric.rb +1 -1
- data/lib/sqreen/middleware.rb +1 -1
- data/lib/sqreen/node.rb +1 -1
- data/lib/sqreen/not_implemented_yet.rb +1 -1
- data/lib/sqreen/null_logger.rb +1 -1
- data/lib/sqreen/payload_creator/header_section.rb +1 -1
- data/lib/sqreen/performance_notifications.rb +1 -1
- data/lib/sqreen/performance_notifications/binned_metrics.rb +1 -1
- data/lib/sqreen/performance_notifications/log.rb +1 -1
- data/lib/sqreen/performance_notifications/log_performance.rb +1 -1
- data/lib/sqreen/performance_notifications/metrics.rb +1 -1
- data/lib/sqreen/prefix.rb +1 -1
- data/lib/sqreen/rails_middleware.rb +1 -1
- data/lib/sqreen/remote_command.rb +1 -1
- data/lib/sqreen/remote_command/failure_output.rb +1 -1
- data/lib/sqreen/rules/attrs.rb +1 -1
- data/lib/sqreen/rules/execjs_cb.rb +1 -0
- data/lib/sqreen/rules/run_user_actions.rb +1 -1
- data/lib/sqreen/run_when_called_cb.rb +1 -1
- data/lib/sqreen/runner.rb +11 -0
- data/lib/sqreen/safe_json.rb +1 -1
- data/lib/sqreen/sensitive_data_redactor.rb +2 -2
- data/lib/sqreen/serializer.rb +1 -1
- data/lib/sqreen/shared_storage.rb +1 -1
- data/lib/sqreen/shrink_wrap.rb +1 -1
- data/lib/sqreen/signals/conversions.rb +22 -2
- data/lib/sqreen/signals/http_trace_redaction.rb +5 -0
- data/lib/sqreen/signals/signals_submission_strategy.rb +5 -0
- data/lib/sqreen/signature_verifier.rb +1 -1
- data/lib/sqreen/sinatra_middleware.rb +1 -1
- data/lib/sqreen/sqreen_signed_verifier.rb +1 -1
- data/lib/sqreen/token_invalid_exception.rb +1 -1
- data/lib/sqreen/token_not_found_exception.rb +1 -1
- data/lib/sqreen/trie.rb +1 -1
- data/lib/sqreen/unauthorized.rb +1 -1
- data/lib/sqreen/util.rb +1 -1
- data/lib/sqreen/util/capped_array.rb +1 -1
- data/lib/sqreen/util/capped_hash.rb +1 -1
- data/lib/sqreen/util/capped_string.rb +1 -1
- data/lib/sqreen/util/capper.rb +1 -1
- data/lib/sqreen/version.rb +2 -2
- data/lib/sqreen/waf_error.rb +1 -1
- data/lib/sqreen/weave.rb +1 -1
- data/lib/sqreen/weave/budget.rb +1 -1
- data/lib/sqreen/weave/hardcoded.rb +1 -1
- data/lib/sqreen/weave/instrumentor.rb +1 -1
- data/lib/sqreen/weave/legacy.rb +1 -1
- data/lib/sqreen/weave/legacy/instrumentation.rb +62 -7
- data/lib/sqreen/web_server/generic.rb +1 -1
- data/lib/sqreen/web_server/webrick.rb +1 -1
- data/lib/sqreen/worker.rb +1 -1
- metadata +24 -12
data/lib/sqreen/event.rb
CHANGED
data/lib/sqreen/events/attack.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
# typed:
|
1
|
+
# typed: ignore
|
2
2
|
|
3
3
|
# Copyright (c) 2015 Sqreen. All Rights Reserved.
|
4
4
|
# Please refer to our terms for more information: https://www.sqreen.com/terms.html
|
@@ -63,6 +63,14 @@ module Sqreen
|
|
63
63
|
payload['context']['backtrace']
|
64
64
|
end
|
65
65
|
|
66
|
+
def datadog_trace_id
|
67
|
+
payload['context']['datadog_trace_id']
|
68
|
+
end
|
69
|
+
|
70
|
+
def datadog_span_id
|
71
|
+
payload['context']['datadog_span_id']
|
72
|
+
end
|
73
|
+
|
66
74
|
def enqueue
|
67
75
|
Sqreen.queue.push(self)
|
68
76
|
end
|
data/lib/sqreen/exception.rb
CHANGED
data/lib/sqreen/framework_cb.rb
CHANGED
@@ -173,7 +173,18 @@ module Sqreen
|
|
173
173
|
:remote_port => req.env['REMOTE_PORT'],
|
174
174
|
:remote_ip => remote_addr,
|
175
175
|
:client_ip => client_ip,
|
176
|
-
}
|
176
|
+
}.tap do |h|
|
177
|
+
h.merge!(
|
178
|
+
:datadog_trace_id => datadog_span.trace_id,
|
179
|
+
:datadog_span_id => datadog_span.span_id,
|
180
|
+
) if datadog_span
|
181
|
+
end
|
182
|
+
end
|
183
|
+
|
184
|
+
def datadog_span
|
185
|
+
return unless defined?(Datadog) && (tracer = Datadog.tracer)
|
186
|
+
|
187
|
+
tracer.active_span
|
177
188
|
end
|
178
189
|
|
179
190
|
def response_infos
|
@@ -377,6 +388,10 @@ module Sqreen
|
|
377
388
|
end
|
378
389
|
end
|
379
390
|
|
391
|
+
def graphql_args=(args)
|
392
|
+
request.env['sqreen.request.graphql_args'] = args if request
|
393
|
+
end
|
394
|
+
|
380
395
|
def self.parameters_from_request(request)
|
381
396
|
return {} unless request
|
382
397
|
|
@@ -388,6 +403,8 @@ module Sqreen
|
|
388
403
|
if (p = rack_params(request))
|
389
404
|
r[P_RACK] = p
|
390
405
|
end
|
406
|
+
p = request.env['sqreen.request.graphql_args']
|
407
|
+
r['graphql'] = p if p
|
391
408
|
# Add grape parameters if seen
|
392
409
|
p = request.env['grape.request.params']
|
393
410
|
r[P_GRAPE] = p if p
|
data/lib/sqreen/graft.rb
CHANGED
data/lib/sqreen/graft/call.rb
CHANGED
data/lib/sqreen/graft/hook.rb
CHANGED
@@ -1,12 +1,11 @@
|
|
1
|
-
# typed:
|
1
|
+
# typed: ignore
|
2
2
|
|
3
3
|
# Copyright (c) 2015 Sqreen. All Rights Reserved.
|
4
4
|
# Please refer to our terms for more information: https://www.sqreen.com/terms.html
|
5
5
|
|
6
6
|
require 'sqreen/graft'
|
7
|
-
require 'sqreen/graft/call'
|
8
|
-
require 'sqreen/graft/callback'
|
9
7
|
require 'sqreen/graft/hook_point'
|
8
|
+
require 'sqreen/graft/callback'
|
10
9
|
|
11
10
|
module Sqreen
|
12
11
|
module Graft
|
@@ -124,297 +123,12 @@ module Sqreen
|
|
124
123
|
@raised = []
|
125
124
|
@ensured = []
|
126
125
|
end
|
127
|
-
|
128
|
-
def self.wrapper(hook)
|
129
|
-
timed_hooks_proc = proc do |t|
|
130
|
-
if (request = Thread.current[:sqreen_http_request])
|
131
|
-
request[:timed_hooks] << t if request[:timed_level] >= 1
|
132
|
-
end
|
133
|
-
end
|
134
|
-
timed_callbacks_proc = proc do |t|
|
135
|
-
if (request = Thread.current[:sqreen_http_request])
|
136
|
-
request[:timed_callbacks] << t if request[:timed_level] >= 1
|
137
|
-
end
|
138
|
-
end
|
139
|
-
|
140
|
-
Proc.new do |*args, &block|
|
141
|
-
request = Thread.current[:sqreen_http_request]
|
142
|
-
|
143
|
-
if Thread.current[:sqreen_hook_entered]
|
144
|
-
if hook.point.super?
|
145
|
-
return super(*args, &block)
|
146
|
-
else
|
147
|
-
return hook.point.apply(self, 'sqreen_hook', *args, &block)
|
148
|
-
end
|
149
|
-
end
|
150
|
-
|
151
|
-
if request && request[:time_budget_expended] && (hook.before + hook.after + hook.raised + hook.ensured).none?(&:mandatory)
|
152
|
-
if request[:timed_level] >= 2
|
153
|
-
begin
|
154
|
-
request[:skipped_callbacks].concat(hook.before)
|
155
|
-
|
156
|
-
if hook.point.super?
|
157
|
-
return super(*args, &block)
|
158
|
-
else
|
159
|
-
return hook.point.apply(self, 'sqreen_hook', *args, &block)
|
160
|
-
end
|
161
|
-
rescue ::Exception # rubocop:disable Lint/RescueException
|
162
|
-
request[:skipped_callbacks].concat(hook.raised)
|
163
|
-
raise
|
164
|
-
else
|
165
|
-
request[:skipped_callbacks].concat(hook.after)
|
166
|
-
ensure
|
167
|
-
request[:skipped_callbacks].concat(hook.ensured)
|
168
|
-
end
|
169
|
-
else
|
170
|
-
if hook.point.super? # rubocop:disable Style/IfInsideElse
|
171
|
-
return super(*args, &block)
|
172
|
-
else
|
173
|
-
return hook.point.apply(self, 'sqreen_hook', *args, &block)
|
174
|
-
end
|
175
|
-
end
|
176
|
-
end
|
177
|
-
|
178
|
-
hook_point_super = hook.point.super?
|
179
|
-
logger = Sqreen::Graft.logger
|
180
|
-
logger_debug = Sqreen::Graft.logger.debug?
|
181
|
-
|
182
|
-
Timer.new(hook.point, &timed_hooks_proc).measure do |chrono|
|
183
|
-
# budget implies request
|
184
|
-
# TODO: make budget depend on a generic context (currently "request")
|
185
|
-
budget = request[:time_budget] if request
|
186
|
-
if budget
|
187
|
-
budget_threshold = request[:time_budget_threshold]
|
188
|
-
budget_ratio = request[:time_budget_ratio]
|
189
|
-
sqreen_timer = request[:sqreen_timer]
|
190
|
-
request_timer = request[:request_timer]
|
191
|
-
end
|
192
|
-
|
193
|
-
hooked_call = HookedCall.new(self, args)
|
194
|
-
|
195
|
-
begin
|
196
|
-
begin
|
197
|
-
sqreen_timer.start if budget
|
198
|
-
Thread.current[:sqreen_hook_entered] = true
|
199
|
-
|
200
|
-
# TODO: make Call have #ball to throw by cb
|
201
|
-
# TODO: can Call be the ball? r = catch(Call.new, &c)
|
202
|
-
# TODO: is catch return value a Call? a #dispatch?
|
203
|
-
# TODO: make before/after/raised return a CallbackCollection << Array (or extend with module)
|
204
|
-
# TODO: add CallbackCollection#each_with_call(instance, args) { |call| ... } ?
|
205
|
-
# TODO: HookCall x CallbackCollection#each_with_call x Flow
|
206
|
-
# TODO: TimedHookCall TimedCallbackCall
|
207
|
-
# TODO: TimeBoundHookCall TimeBoundCallbackCall TimeBoundFlow?
|
208
|
-
|
209
|
-
request_elapsed = request_timer.elapsed if budget
|
210
|
-
|
211
|
-
hook.before.each do |c|
|
212
|
-
next if c.ignore && c.ignore.call
|
213
|
-
|
214
|
-
if budget && !c.mandatory
|
215
|
-
sqreen_elapsed = sqreen_timer.elapsed
|
216
|
-
if budget_ratio && !request[:time_budget_expended]
|
217
|
-
fixed_budget = budget_threshold
|
218
|
-
proportional_budget = (request_elapsed - sqreen_elapsed) * budget_ratio
|
219
|
-
remaining = (fixed_budget > proportional_budget ? fixed_budget : proportional_budget) - sqreen_elapsed
|
220
|
-
else
|
221
|
-
remaining = budget_threshold - sqreen_elapsed
|
222
|
-
end
|
223
|
-
unless remaining > 0
|
224
|
-
request[:skipped_callbacks] << c
|
225
|
-
request[:time_budget_expended] = true
|
226
|
-
next
|
227
|
-
end
|
228
|
-
end
|
229
|
-
|
230
|
-
flow = catch(Ball.new) do |ball|
|
231
|
-
Timer.new(c.name, &timed_callbacks_proc).measure(ignore: chrono) do
|
232
|
-
c.call(CallbackCall.new(c, remaining, hooked_call.instance, hooked_call.args_passed), ball)
|
233
|
-
end
|
234
|
-
end
|
235
|
-
|
236
|
-
next unless c.flow && flow.is_a?(Flow)
|
237
|
-
hooked_call.raise = flow.raise and hooked_call.raising = true if flow.raise?
|
238
|
-
hooked_call.args_pass = flow.args and hooked_call.args_passing = true if flow.args?
|
239
|
-
hooked_call.return = flow.return and hooked_call.returning = true if flow.return?
|
240
|
-
break if flow.break?
|
241
|
-
end unless hook.disabled?
|
242
|
-
rescue StandardError => e
|
243
|
-
Sqreen::Weave.logger.debug { "exception:#{e.class} message:'#{e.message}' location:\"#{e.backtrace[0]}\"" }
|
244
|
-
Sqreen::RemoteException.record(e) if Sqreen.queue
|
245
|
-
end
|
246
|
-
|
247
|
-
raise hooked_call.raise if hooked_call.raising
|
248
|
-
return hooked_call.return if hooked_call.returning
|
249
|
-
ensure
|
250
|
-
Thread.current[:sqreen_hook_entered] = false
|
251
|
-
sqreen_timer.stop if budget
|
252
|
-
end unless hook.before.empty?
|
253
|
-
|
254
|
-
begin
|
255
|
-
chrono.ignore do
|
256
|
-
if hook_point_super
|
257
|
-
hooked_call.returned = super(*(hooked_call.args_passing ? hooked_call.args_pass : hooked_call.args_passed), &block)
|
258
|
-
else
|
259
|
-
hooked_call.returned = hook.point.apply(hooked_call.instance, 'sqreen_hook', *(hooked_call.args_passing ? hooked_call.args_pass : hooked_call.args_passed), &block)
|
260
|
-
end
|
261
|
-
end
|
262
|
-
rescue ::Exception => e # rubocop:disable Lint/RescueException
|
263
|
-
begin
|
264
|
-
sqreen_timer.start if budget
|
265
|
-
Thread.current[:sqreen_hook_entered] = true
|
266
|
-
hooked_call.raised = e
|
267
|
-
|
268
|
-
logger.debug { "[#{Process.pid}] Hook #{hook.point} disabled:#{hook.disabled?} exception:#{e}" } if logger_debug
|
269
|
-
raise if hook.raised.empty?
|
270
|
-
|
271
|
-
request_elapsed = request_timer.elapsed if budget
|
272
|
-
|
273
|
-
hook.raised.each do |c|
|
274
|
-
next if c.ignore && c.ignore.call
|
275
|
-
|
276
|
-
if budget && !c.mandatory
|
277
|
-
sqreen_elapsed = sqreen_timer.elapsed
|
278
|
-
if budget_ratio && !request[:time_budget_expended]
|
279
|
-
fixed_budget = budget_threshold
|
280
|
-
proportional_budget = (request_elapsed - sqreen_elapsed) * budget_ratio
|
281
|
-
remaining = (fixed_budget > proportional_budget ? fixed_budget : proportional_budget) - sqreen_elapsed
|
282
|
-
else
|
283
|
-
remaining = budget_threshold - sqreen_elapsed
|
284
|
-
end
|
285
|
-
unless remaining > 0
|
286
|
-
request[:skipped_callbacks] << c
|
287
|
-
request[:time_budget_expended] = true
|
288
|
-
next
|
289
|
-
end
|
290
|
-
end
|
291
|
-
|
292
|
-
flow = catch(Ball.new) do |ball|
|
293
|
-
Timer.new(c.name, &timed_callbacks_proc).measure(ignore: chrono) do
|
294
|
-
c.call(CallbackCall.new(c, remaining, hooked_call.instance, hooked_call.args_passing ? hooked_call.args_pass : hooked_call.args_passed, hooked_call.raised), ball)
|
295
|
-
end
|
296
|
-
end
|
297
|
-
|
298
|
-
next unless c.flow && flow.is_a?(Flow)
|
299
|
-
hooked_call.raise = flow.raise and hooked_call.raising = true if flow.raise?
|
300
|
-
hooked_call.return = flow.return and hooked_call.returning = true if flow.return?
|
301
|
-
hooked_call.retrying = true if flow.retry?
|
302
|
-
break if flow.break?
|
303
|
-
end unless hook.disabled?
|
304
|
-
rescue StandardError => e
|
305
|
-
Sqreen::Weave.logger.debug { "exception:#{e.class} message:'#{e.message}' location:\"#{e.backtrace[0]}\"" }
|
306
|
-
Sqreen::RemoteException.record(e) if Sqreen.queue
|
307
|
-
end
|
308
|
-
|
309
|
-
retry if hooked_call.retrying
|
310
|
-
raise hooked_call.raise if hooked_call.raising
|
311
|
-
return hooked_call.return if hooked_call.returning
|
312
|
-
raise
|
313
|
-
else
|
314
|
-
begin
|
315
|
-
sqreen_timer.start if budget
|
316
|
-
Thread.current[:sqreen_hook_entered] = true
|
317
|
-
|
318
|
-
# TODO: hooked_call.returning should be always false here?
|
319
|
-
return hooked_call.returning ? hooked_call.return : hooked_call.returned if hook.after.empty?
|
320
|
-
|
321
|
-
request_elapsed = request_timer.elapsed if budget
|
322
|
-
|
323
|
-
hook.after.each do |c|
|
324
|
-
next if c.ignore && c.ignore.call
|
325
|
-
|
326
|
-
if budget && !c.mandatory
|
327
|
-
sqreen_elapsed = sqreen_timer.elapsed
|
328
|
-
if budget_ratio && !request[:time_budget_expended]
|
329
|
-
fixed_budget = budget_threshold
|
330
|
-
proportional_budget = (request_elapsed - sqreen_elapsed) * budget_ratio
|
331
|
-
remaining = (fixed_budget > proportional_budget ? fixed_budget : proportional_budget) - sqreen_elapsed
|
332
|
-
else
|
333
|
-
remaining = budget_threshold - sqreen_elapsed
|
334
|
-
end
|
335
|
-
unless remaining > 0
|
336
|
-
request[:skipped_callbacks] << c
|
337
|
-
request[:time_budget_expended] = true
|
338
|
-
next
|
339
|
-
end
|
340
|
-
end
|
341
|
-
|
342
|
-
flow = catch(Ball.new) do |ball|
|
343
|
-
Timer.new(c.name, &timed_callbacks_proc).measure(ignore: chrono) do
|
344
|
-
c.call(CallbackCall.new(c, remaining, hooked_call.instance, hooked_call.args_passing ? hooked_call.args_pass : hooked_call.args_passed, nil, hooked_call.returned), ball)
|
345
|
-
end
|
346
|
-
end
|
347
|
-
|
348
|
-
next unless c.flow && flow.is_a?(Flow)
|
349
|
-
hooked_call.raise = flow.raise and hooked_call.raising = true if flow.raise?
|
350
|
-
hooked_call.return = flow.return and hooked_call.returning = true if flow.return?
|
351
|
-
break if flow.break?
|
352
|
-
end unless hook.disabled?
|
353
|
-
rescue StandardError => e
|
354
|
-
Sqreen::Weave.logger.debug { "exception:#{e.class} message:'#{e.message}' location:\"#{e.backtrace[0]}\"" }
|
355
|
-
Sqreen::RemoteException.record(e) if Sqreen.queue
|
356
|
-
end
|
357
|
-
|
358
|
-
raise hooked_call.raise if hooked_call.raising
|
359
|
-
return hooked_call.returning ? hooked_call.return : hooked_call.returned
|
360
|
-
ensure
|
361
|
-
begin
|
362
|
-
# TODO: sqreen_timer.start if someone has thrown?
|
363
|
-
# TODO: sqreen_timer.stop at end of rescue+else?
|
364
|
-
# TODO: Thread.current[:sqreen_hook_entered] = true if neither rescue nor else ie thrown?
|
365
|
-
# TODO: Thread.current[:sqreen_hook_entered] = false at end of rescue+else? (risky?)
|
366
|
-
|
367
|
-
# TODO: uniform early bail out? (but don't forget sqreen_hook_entered and sqreen_timer)
|
368
|
-
# return hooked_call.returning ? hooked_call.return : hooked_call.returned if hook.ensured.empty?
|
369
|
-
|
370
|
-
# done at either rescue or else
|
371
|
-
# request_elapsed = request_timer.elapsed if budget # && !hook.ensured.empty?
|
372
|
-
|
373
|
-
hook.ensured.each do |c|
|
374
|
-
next if c.ignore && c.ignore.call
|
375
|
-
|
376
|
-
if budget && !c.mandatory
|
377
|
-
sqreen_elapsed = sqreen_timer.elapsed
|
378
|
-
if budget_ratio && !request[:time_budget_expended]
|
379
|
-
fixed_budget = budget_threshold
|
380
|
-
proportional_budget = (request_elapsed - sqreen_elapsed) * budget_ratio
|
381
|
-
remaining = (fixed_budget > proportional_budget ? fixed_budget : proportional_budget) - sqreen_elapsed
|
382
|
-
else
|
383
|
-
remaining = budget_threshold - sqreen_elapsed
|
384
|
-
end
|
385
|
-
unless remaining > 0
|
386
|
-
request[:skipped_callbacks] << c
|
387
|
-
request[:time_budget_expended] = true
|
388
|
-
next
|
389
|
-
end
|
390
|
-
end
|
391
|
-
|
392
|
-
flow = catch(Ball.new) do |ball|
|
393
|
-
Timer.new(c.name, &timed_callbacks_proc).measure(ignore: chrono) do
|
394
|
-
c.call(CallbackCall.new(c, remaining, hooked_call.instance, hooked_call.args_passing ? hooked_call.args_pass : hooked_call.args_passed, nil, hooked_call.returned), ball)
|
395
|
-
end
|
396
|
-
end
|
397
|
-
|
398
|
-
next unless c.flow && flow.is_a?(Flow)
|
399
|
-
hooked_call.raise = flow.raise and hooked_call.raising = true if flow.raise?
|
400
|
-
hooked_call.return = flow.return and hooked_call.returning = true if flow.return?
|
401
|
-
break if flow.break?
|
402
|
-
end unless hook.ensured.empty? || hook.disabled?
|
403
|
-
|
404
|
-
Thread.current[:sqreen_hook_entered] = false
|
405
|
-
sqreen_timer.stop if budget
|
406
|
-
rescue StandardError => e
|
407
|
-
Sqreen::Weave.logger.debug { "exception:#{e.class} message:'#{e.message}' location:\"#{e.backtrace[0]}\"" }
|
408
|
-
Sqreen::RemoteException.record(e) if Sqreen.queue
|
409
|
-
end
|
410
|
-
|
411
|
-
# TODO: should we run the following?
|
412
|
-
# raise hooked_call.raise if hooked_call.raising
|
413
|
-
# return hooked_call.returning ? hooked_call.return : hooked_call.returned
|
414
|
-
end
|
415
|
-
end # chrono
|
416
|
-
end
|
417
|
-
end
|
418
126
|
end
|
419
127
|
end
|
420
128
|
end
|
129
|
+
|
130
|
+
if RUBY_VERSION =~ /^2\./
|
131
|
+
load File.join(__dir__, 'hook.ruby_2.rb')
|
132
|
+
else
|
133
|
+
load File.join(__dir__, 'hook.ruby_3.rb')
|
134
|
+
end
|