diff options
| -rw-r--r-- | changelogs/unreleased/sh-bump-sentry-raven-and-faraday.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile | 4 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 12 | ||||
| -rw-r--r-- | ruby/lib/gitaly_server/sentry.rb | 5 | ||||
| -rw-r--r-- | ruby/spec/lib/gitaly_server/sentry/url_sanitizer_spec.rb | 2 |
5 files changed, 13 insertions, 15 deletions
diff --git a/changelogs/unreleased/sh-bump-sentry-raven-and-faraday.yml b/changelogs/unreleased/sh-bump-sentry-raven-and-faraday.yml new file mode 100644 index 000000000..5b5fb1f43 --- /dev/null +++ b/changelogs/unreleased/sh-bump-sentry-raven-and-faraday.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade sentry-raven and Faraday gems to v1.0.1 +merge_request: 2533 +author: +type: other diff --git a/ruby/Gemfile b/ruby/Gemfile index 912efcc79..cdb388b5d 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -11,8 +11,8 @@ gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false gem 'grpc', '~> 1.30.2' -gem 'sentry-raven', '~> 2.9.0', require: false -gem 'faraday', '~> 0.12' +gem 'sentry-raven', '~> 3.0', require: false +gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 81ae62035..19dc85ff4 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -45,7 +45,7 @@ GEM escape_utils (1.2.1) factory_bot (5.0.2) activesupport (>= 4.2.0) - faraday (0.15.4) + faraday (1.0.1) multipart-post (>= 1.2, < 3) ffi (1.13.1) gemojione (3.3.0) @@ -107,7 +107,7 @@ GEM mini_portile2 (2.4.0) minitest (5.14.0) msgpack (1.3.3) - multipart-post (2.0.0) + multipart-post (2.1.1) nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) @@ -175,8 +175,8 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4) - sentry-raven (2.9.0) - faraday (>= 0.7.6, < 1.0) + sentry-raven (3.0.4) + faraday (>= 1.0) simplecov (0.17.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -211,7 +211,7 @@ DEPENDENCIES activesupport (~> 6.0.3.1) bundler (>= 1.17.3) factory_bot - faraday (~> 0.12) + faraday (~> 1.0) github-linguist (~> 7.9) gitlab-gollum-lib (~> 4.2.7.9) gitlab-gollum-rugged_adapter (~> 0.4.4.2) @@ -229,7 +229,7 @@ DEPENDENCIES rspec-parameterized rubocop (~> 0.69) rugged (~> 0.28) - sentry-raven (~> 2.9.0) + sentry-raven (~> 3.0) simplecov (~> 0.17.1) timecop vcr (~> 4.0.0) diff --git a/ruby/lib/gitaly_server/sentry.rb b/ruby/lib/gitaly_server/sentry.rb index bb6d9100f..109953229 100644 --- a/ruby/lib/gitaly_server/sentry.rb +++ b/ruby/lib/gitaly_server/sentry.rb @@ -14,7 +14,6 @@ module GitalyServer include GitalyServer::Utils def process(data) - sanitize_message(data) sanitize_fingerprint(data) sanitize_exceptions(data) sanitize_logentry(data) @@ -47,10 +46,6 @@ module GitalyServer values.each { |exception_data| exception_data[:value] = sanitize_url(exception_data[:value]) } end - - def sanitize_message(data) - data[:message] = sanitize_url(data[:message]) - end end end end diff --git a/ruby/spec/lib/gitaly_server/sentry/url_sanitizer_spec.rb b/ruby/spec/lib/gitaly_server/sentry/url_sanitizer_spec.rb index 858045f31..d7a49410b 100644 --- a/ruby/spec/lib/gitaly_server/sentry/url_sanitizer_spec.rb +++ b/ruby/spec/lib/gitaly_server/sentry/url_sanitizer_spec.rb @@ -27,8 +27,6 @@ describe GitalyServer::Sentry::URLSanitizer do data = JSON.parse(last_sentry_event[1]) - expect(data['message']).to eq("StandardError: #{ex_sanitized_message}") - expect(data['logentry']['message']).to eq("StandardError: #{ex_sanitized_message}") expect(data['fingerprint'].last).to eq(ex_sanitized_message) expect(data['exception']['values'][0]['value']).to eq(ex_sanitized_message) end |