Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
60a35e42
Commit
60a35e42
authored
Oct 02, 2017
by
Alejandro Rodríguez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Send API parameters as extra data for sentry errors
parent
b40192a9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
3 deletions
+31
-3
config/initializers/sentry.rb
config/initializers/sentry.rb
+3
-1
lib/api/helpers.rb
lib/api/helpers.rb
+1
-1
spec/requests/api/helpers_spec.rb
spec/requests/api/helpers_spec.rb
+27
-1
No files found.
config/initializers/sentry.rb
View file @
60a35e42
...
...
@@ -2,7 +2,7 @@
require
'gitlab/current_settings'
if
Rails
.
env
.
production?
def
configure_sentry
# allow it to fail: it may do so when create_from_defaults is executed before migrations are actually done
begin
sentry_enabled
=
Gitlab
::
CurrentSettings
.
current_application_settings
.
sentry_enabled
...
...
@@ -23,3 +23,5 @@ if Rails.env.production?
end
end
end
configure_sentry
if
Rails
.
env
.
production?
lib/api/helpers.rb
View file @
60a35e42
...
...
@@ -287,7 +287,7 @@ module API
if
sentry_enabled?
&&
report_exception?
(
exception
)
define_params_for_grape_middleware
sentry_context
Raven
.
capture_exception
(
exception
)
Raven
.
capture_exception
(
exception
,
extra:
params
)
end
# lifted from https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb#L60
...
...
spec/requests/api/helpers_spec.rb
View file @
60a35e42
require
'spec_helper'
require
'raven/transports/dummy'
require_relative
'../../../config/initializers/sentry'
describe
API
::
Helpers
do
include
API
::
APIGuard
::
HelperMethods
...
...
@@ -476,7 +478,7 @@ describe API::Helpers do
allow
(
exception
).
to
receive
(
:backtrace
).
and_return
(
caller
)
expect_any_instance_of
(
self
.
class
).
to
receive
(
:sentry_context
)
expect
(
Raven
).
to
receive
(
:capture_exception
).
with
(
exception
)
expect
(
Raven
).
to
receive
(
:capture_exception
).
with
(
exception
,
extra:
{}
)
handle_api_exception
(
exception
)
end
...
...
@@ -501,6 +503,30 @@ describe API::Helpers do
expect
(
json_response
[
'message'
]).
to
start_with
(
"
\n
RuntimeError (Runtime Error!):"
)
end
end
context
'extra information'
do
# Sentry events are an array of the form [auth_header, data, options]
let
(
:event_data
)
{
Raven
.
client
.
transport
.
events
.
first
[
1
]
}
before
do
stub_application_setting
(
sentry_enabled:
true
,
sentry_dsn:
"dummy://12345:67890@sentry.localdomain/sentry/42"
)
configure_sentry
Raven
.
client
.
configuration
.
encoding
=
'json'
end
it
'sends the params, excluding confidential values'
do
expect
(
Gitlab
::
Sentry
).
to
receive
(
:enabled?
).
twice
.
and_return
(
true
)
expect
(
ProjectsFinder
).
to
receive
(
:new
).
and_raise
(
'Runtime Error!'
)
get
api
(
'/projects'
,
user
),
password:
'dont_send_this'
,
other_param:
'send_this'
expect
(
event_data
).
to
include
(
'other_param=send_this'
)
expect
(
event_data
).
to
include
(
'password=********'
)
end
end
end
describe
'.authenticate_non_get!'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment