railties (>= 3.1)
bootstrap-x-editable-rails (1.5.1.1)
railties (>= 3.0)
- builder (3.2.2)
+ builder (3.2.3)
byebug (3.5.1)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
coffee-script-source (1.8.0)
columnize (0.9.0)
commonjs (0.2.7)
+ concurrent-ruby (1.0.5)
daemon_controller (1.2.0)
debugger-linecache (1.2.0)
deep_merge (1.0.1)
headless (1.0.2)
highline (1.6.21)
httpclient (2.8.2.4)
- i18n (0.7.0)
+ i18n (0.9.0)
+ concurrent-ruby (~> 1.0)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.8.3)
+ json (1.8.6)
jwt (1.5.4)
launchy (2.4.3)
addressable (~> 2.3)
logging (2.1.0)
little-plugger (~> 1.1)
multi_json (~> 1.10)
- lograge (0.3.6)
- actionpack (>= 3)
- activesupport (>= 3)
- railties (>= 3)
+ lograge (0.7.1)
+ actionpack (>= 4, < 5.2)
+ activesupport (>= 4, < 5.2)
+ railties (>= 4, < 5.2)
+ request_store (~> 1.0)
logstash-event (1.2.02)
mail (2.6.3)
mime-types (>= 1.16, < 3)
metaclass (0.0.4)
mime-types (2.99)
mini_portile (0.6.2)
- minitest (5.8.4)
+ minitest (5.10.3)
mocha (1.1.0)
metaclass (~> 0.0.1)
morrisjs-rails (0.5.1)
activesupport (= 4.1.12)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (10.4.2)
+ rake (12.2.1)
rake-compiler (0.9.5)
rake
raphael-rails (2.1.2)
ref (1.0.5)
+ request_store (1.3.2)
retriable (1.4.1)
ruby-debug-passenger (0.2.0)
ruby-prof (0.15.2)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
- thor (0.19.1)
- thread_safe (0.3.5)
+ thor (0.20.0)
+ thread_safe (0.3.6)
tilt (1.4.1)
- tzinfo (1.2.2)
+ tzinfo (1.2.4)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
wiselinks
BUNDLED WITH
- 1.15.1
+ 1.16.0
ERROR_ACTIONS = [:render_error, :render_not_found]
- prepend_before_filter :set_current_request_id, except: ERROR_ACTIONS
around_filter :thread_clear
+ around_filter :set_current_request_id
around_filter :set_thread_api_token
# Methods that don't require login should
# skip_around_filter :require_thread_api_token
Rails.cache.delete_matched(/^request_#{Thread.current.object_id}_/)
end
+ def set_current_request_id
+ response.headers['X-Request-Id'] =
+ Thread.current[:request_id] =
+ "req-" + Random::DEFAULT.rand(2**128).to_s(36)[0..19]
+ yield
+ Thread.current[:request_id] = nil
+ end
+
+ def append_info_to_payload(payload)
+ super
+ payload[:request_id] = response.headers['X-Request-Id']
+ end
+
# Set up the thread with the given API token and associated user object.
def load_api_token(new_token)
Thread.current[:arvados_api_token] = new_token
def wiselinks_layout
'body'
end
-
- def set_current_request_id
- # Request ID format: '<timestamp>-<9_digits_random_number>'
- current_request_id = "#{Time.new.to_i}-#{sprintf('%09d', rand(0..10**9-1))}"
- Thread.current[:current_request_id] = current_request_id
- end
end
url.sub! '/arvados/v1/../../', '/'
query = {
- 'api_token' => (tokens[:arvados_api_token] ||
- Thread.current[:arvados_api_token] ||
- ''),
'reader_tokens' => ((tokens[:reader_tokens] ||
Thread.current[:reader_tokens] ||
[]) +
[Rails.configuration.anonymous_user_token]).to_json,
- 'current_request_id' => (Thread.current[:current_request_id] || ''),
}
if !data.nil?
data.each do |k,v|
query["_profile"] = "true"
end
- header = {"Accept" => "application/json"}
+ headers = {
+ "Accept" => "application/json",
+ "Authorization" => "OAuth2 " +
+ (tokens[:arvados_api_token] ||
+ Thread.current[:arvados_api_token] ||
+ ''),
+ "X-Request-Id" => Thread.current[:request_id] || '',
+ }
profile_checkpoint { "Prepare request #{query["_method"] or "POST"} #{url} #{query[:uuid]} #{query.inspect[0,256]}" }
msg = @client_mtx.synchronize do
begin
- @api_client.post(url, query, header: header)
+ @api_client.post(url, query, headers)
rescue => exception
raise NoApiResponseException.new(url, exception)
end
config.lograge.enabled = true
config.lograge.formatter = Lograge::Formatters::Logstash.new
config.lograge.custom_options = lambda do |event|
+ payload = {
+ request_id: event.payload[:request_id],
+ }
+ # Also log params (minus the pseudo-params added by Rails). But if
+ # params is huge, don't log the whole thing, just hope we get the
+ # most useful bits in truncate(json(params)).
exceptions = %w(controller action format id)
- params = {current_request_id: Thread.current[:current_request_id]}.
- merge(event.payload[:params].except(*exceptions))
+ params = event.payload[:params].except(*exceptions)
params_s = Oj.dump(params)
- Thread.current[:current_request_id] = nil # Clear for next request
if params_s.length > 1000
- { params_truncated: params_s[0..1000] + "[...]" }
+ payload[:params_truncated] = params_s[0..1000] + "[...]"
else
- { params: params }
+ payload[:params] = params
end
+ payload
end
end
assert_response 404
end
- test "requesting to the API server includes client_session_id param" do
- got_query = nil
+ test "requesting to the API server includes X-Request-Id header" do
+ got_header = nil
stub_api_calls
- stub_api_client.stubs(:post).with do |url, query, opts={}|
- got_query = query
+ stub_api_client.stubs(:post).with do |url, query, header={}|
+ got_header = header
true
end.returns fake_api_response('{}', 200, {})
test_uuid = "zzzzz-j7d0g-zzzzzzzzzzzzzzz"
get(:show, {id: test_uuid})
- assert_includes got_query, 'current_request_id'
- assert_match /\d{10}-\d{9}/, got_query['current_request_id']
+ assert_not_nil got_header
+ assert_includes got_header, 'X-Request-Id'
+ assert_match /^req-[0-9a-zA-Z]{20}$/, got_header["X-Request-Id"]
end
- test "current_request_id is nil after a request" do
+ test "current request_id is nil after a request" do
@controller = NodesController.new
get(:index, {}, session_for(:active))
- assert_nil Thread.current[:current_request_id]
+ assert_nil Thread.current[:request_id]
+ end
+
+ test "X-Request-Id header" do
+ @controller = NodesController.new
+ get(:index, {}, session_for(:active))
+ assert_match /^req-[0-9a-zA-Z]{20}$/, response.headers['X-Request-Id']
end
[".navbar .login-menu a",
projects / arvados.git / commitdiff