sentry-raven 3.0.2 → 3.1.2

data/lib/raven/processor/cookies.rb

@@ -30,7 +30,7 @@ module Raven
     end
 
     def generate_masked_cookies(cookies)
-      cookies.merge(cookies) { STRING_MASK }
+      cookies.merge(cookies) { STRING_MASK } if cookies.respond_to?(:merge)
     end
   end
 end

data/lib/raven/processor/removecircularreferences.rb

@@ -1,7 +1,8 @@
 module Raven
   class Processor::RemoveCircularReferences < Processor
+    ELISION_STRING = "(...)".freeze
     def process(value, visited = [])
-      return "(...)" if visited.include?(value.__id__)
+      return ELISION_STRING if visited.include?(value.__id__)
 
       visited << value.__id__ if value.is_a?(Array) || value.is_a?(Hash)
 

data/lib/raven/transports/http.rb

@@ -1,7 +1,5 @@
 require 'faraday'
 
-require 'raven/transports'
-
 module Raven
   module Transports
     class HTTP < Transport
@@ -15,7 +13,8 @@ module Raven
 
       def send_event(auth_header, data, options = {})
         unless configuration.sending_allowed?
-          logger.debug("Event not sent: #{configuration.error_messages}")
+          configuration.logger.debug("Event not sent: #{configuration.error_messages}")
+          return
         end
 
         project_id = configuration[:project_id]

data/lib/raven/utils/context_filter.rb

@@ -0,0 +1,42 @@
+module Raven
+  module Utils
+    module ContextFilter
+      class << self
+        ACTIVEJOB_RESERVED_PREFIX_REGEX = /^_aj_/.freeze
+        HAS_GLOBALID = const_defined?('GlobalID')
+
+        # Once an ActiveJob is queued, ActiveRecord references get serialized into
+        # some internal reserved keys, such as _aj_globalid.
+        #
+        # The problem is, if this job in turn gets queued back into ActiveJob with
+        # these magic reserved keys, ActiveJob will throw up and error. We want to
+        # capture these and mutate the keys so we can sanely report it.
+        def filter_context(context)
+          case context
+          when Array
+            context.map { |arg| filter_context(arg) }
+          when Hash
+            Hash[context.map { |key, value| filter_context_hash(key, value) }]
+          else
+            format_globalid(context)
+          end
+        end
+
+        private
+
+        def filter_context_hash(key, value)
+          key = key.to_s.sub(ACTIVEJOB_RESERVED_PREFIX_REGEX, "") if key.match(ACTIVEJOB_RESERVED_PREFIX_REGEX)
+          [key, filter_context(value)]
+        end
+
+        def format_globalid(context)
+          if HAS_GLOBALID && context.is_a?(GlobalID)
+            context.to_s
+          else
+            context
+          end
+        end
+      end
+    end
+  end
+end

data/lib/raven/utils/request_id.rb

@@ -0,0 +1,16 @@
+module Raven
+  module Utils
+    module RequestId
+      REQUEST_ID_HEADERS = %w(action_dispatch.request_id HTTP_X_REQUEST_ID).freeze
+
+      # Request ID based on ActionDispatch::RequestId
+      def self.read_from(env_hash)
+        REQUEST_ID_HEADERS.each do |key|
+          request_id = env_hash[key]
+          return request_id if request_id
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/raven/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Raven
-  VERSION = "3.0.2"
+  VERSION = "3.1.2"
 end

data/lib/sentry-raven-without-integrations.rb

@@ -1 +1,6 @@
-require 'raven/base'
+require "raven/helpers/deprecation_helper"
+
+filename = "sentry_raven_without_integrations"
+DeprecationHelper.deprecate_dasherized_filename(filename)
+
+require filename

data/lib/sentry_raven_without_integrations.rb

@@ -0,0 +1 @@
+require 'raven/base'

data/sentry-raven.gemspec

@@ -18,4 +18,11 @@ Gem::Specification.new do |gem|
   gem.executables = "raven"
 
   gem.add_dependency "faraday", ">= 1.0"
+
+  gem.post_install_message = <<~EOS
+    `sentry-raven` is deprecated! Please migrate to `sentry-ruby`
+
+    See https://docs.sentry.io/platforms/ruby/migration for the migration guide.
+
+  EOS
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-raven
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.2
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -34,35 +34,36 @@ extra_rdoc_files:
 - LICENSE
 files:
 - ".craft.yml"
-- ".github/workflows/test.yml"
-- ".gitignore"
-- ".gitmodules"
-- ".rspec"
-- ".rubocop.yml"
-- ".scripts/bump-version.sh"
+- ".scripts/bump-version.rb"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
+- Makefile
 - README.md
 - Rakefile
-- changelog.md
 - exe/raven
 - lib/raven.rb
 - lib/raven/backtrace.rb
 - lib/raven/base.rb
 - lib/raven/breadcrumbs.rb
-- lib/raven/breadcrumbs/activesupport.rb
+- lib/raven/breadcrumbs/active_support_logger.rb
 - lib/raven/breadcrumbs/logger.rb
+- lib/raven/breadcrumbs/sentry_logger.rb
 - lib/raven/cli.rb
 - lib/raven/client.rb
 - lib/raven/configuration.rb
 - lib/raven/context.rb
+- lib/raven/core_ext/object/deep_dup.rb
+- lib/raven/core_ext/object/duplicable.rb
 - lib/raven/event.rb
+- lib/raven/helpers/deprecation_helper.rb
 - lib/raven/instance.rb
 - lib/raven/integrations/delayed_job.rb
 - lib/raven/integrations/rack-timeout.rb
 - lib/raven/integrations/rack.rb
 - lib/raven/integrations/rails.rb
 - lib/raven/integrations/rails/active_job.rb
+- lib/raven/integrations/rails/backtrace_cleaner.rb
 - lib/raven/integrations/rails/controller_methods.rb
 - lib/raven/integrations/rails/controller_transaction.rb
 - lib/raven/integrations/rails/overrides/debug_exceptions_catcher.rb
@@ -70,6 +71,8 @@ files:
 - lib/raven/integrations/railties.rb
 - lib/raven/integrations/rake.rb
 - lib/raven/integrations/sidekiq.rb
+- lib/raven/integrations/sidekiq/cleanup_middleware.rb
+- lib/raven/integrations/sidekiq/error_handler.rb
 - lib/raven/integrations/tasks.rb
 - lib/raven/interface.rb
 - lib/raven/interfaces/exception.rb
@@ -91,18 +94,25 @@ files:
 - lib/raven/transports/dummy.rb
 - lib/raven/transports/http.rb
 - lib/raven/transports/stdout.rb
+- lib/raven/utils/context_filter.rb
 - lib/raven/utils/deep_merge.rb
 - lib/raven/utils/exception_cause_chain.rb
 - lib/raven/utils/real_ip.rb
+- lib/raven/utils/request_id.rb
 - lib/raven/version.rb
 - lib/sentry-raven-without-integrations.rb
 - lib/sentry-raven.rb
+- lib/sentry_raven_without_integrations.rb
 - sentry-raven.gemspec
 homepage: https://github.com/getsentry/raven-ruby
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message: |+
+  `sentry-raven` is deprecated! Please migrate to `sentry-ruby`
+
+  See https://docs.sentry.io/platforms/ruby/migration for the migration guide.
+
 rdoc_options: []
 require_paths:
 - lib

data/.github/workflows/test.yml

@@ -1,77 +0,0 @@
-name: Test
-
-on: 
-  push:
-    branches:
-      - master
-      - release/**
-  pull_request:
-jobs:
-  test:
-    name: Test on ruby ${{ matrix.ruby_version }} and rails ${{ matrix.rails_version }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        rails_version: [0, 4.2, 5.2, 6.0]
-        ruby_version: [2.3, 2.4, 2.5, 2.6, 2.7, jruby, head]
-        os: [ubuntu-latest]
-        include:
-          - ruby_version: head
-            rails_version: 0
-          - ruby_version: 2.7
-            rails_version: 6.0
-            env: RUBYOPT="--enable-frozen-string-literal --debug=frozen-string-literal"
-        exclude:
-          - ruby_version: 2.3
-            rails_version: 6.0
-          - ruby_version: 2.4
-            rails_version: 6.0
-          - ruby_version: 2.7
-            rails_version: 4.2
-          - ruby_version: head
-            rails_version: 4.2
-          - ruby_version: head
-            rails_version: 5.2
-          - ruby_version: head
-            rails_version: 6.0
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Set up Ruby ${{ matrix.ruby_version }}
-      uses: ruby/setup-ruby@v1
-      with:
-        bundler: 1
-        ruby-version: ${{ matrix.ruby_version }}
-
-    - name: Build with Rails ${{ matrix.rails_version }}
-      env:
-        RAILS_VERSION: ${{ matrix.rails_version }}
-      run: | 
-        bundle install --jobs 4 --retry 3
-        bundle exec rake
-
-  job_zeus:
-    name: Zeus
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.6 # Not needed with a .ruby-version file
-      - run: bundle install
-      - name: Install Zeus
-        run: |
-          yarn global add @zeus-ci/cli
-          echo "::add-path::$(yarn global bin)"
-      - name: Upload to Zeus
-        env:
-          ZEUS_API_TOKEN: ${{ secrets.ZEUS_API_TOKEN }}
-          ZEUS_HOOK_BASE: ${{ secrets.ZEUS_HOOK_BASE }}
-        run: |
-          zeus job update -b $GITHUB_RUN_ID -j $GITHUB_RUN_NUMBER -r $GITHUB_SHA
-          gem build sentry-raven.gemspec
-          zeus upload -b $GITHUB_RUN_ID -j $GITHUB_RUN_NUMBER -t "application/tar+gem" ./*.gem
-          zeus job update --status=passed -b $GITHUB_RUN_ID -j $GITHUB_RUN_NUMBER -r $GITHUB_SHA

data/.gitignore

@@ -1,15 +0,0 @@
-coverage
-pkg
-ruby/
-log/
-.bundle
-*.gem
-gemfiles/*.lock
-Gemfile.lock
-.coveralls.yml
-.ruby-version
-.ruby-gemset
-.idea
-*.rdb
-
-examples/**/node_modules

data/.rspec

@@ -1 +0,0 @@
---colour

data/.rubocop.yml

@@ -1,109 +0,0 @@
-AllCops:
-   Include:
-     - 'lib/**/*.rb'
-     - 'spec/**/*.rb'
-   Exclude:
-     - 'examples/**/*'
-     - 'vendor/**/*'
-
-Metrics/ClassLength:
-  Max: 300
-  CountComments: false
-
-Metrics/AbcSize:
-  Max: 40
-
-Metrics/BlockLength:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Max: 12
-
-Metrics/PerceivedComplexity:
-  Max: 11
-
-Metrics/MethodLength:
-  Max: 30
-
-Style/SymbolArray:
-  Enabled: false
-
-Style/PercentLiteralDelimiters:
-  Enabled: false
-
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-Style/SignalException:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-Style/RescueStandardError:
-  Enabled: false
-
-Style/ParallelAssignment:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/CommentedKeyword:
-  Enabled: false
-
-Style/RescueModifier:
-  Enabled: false
-
-Style/StringLiterals:
-  Enabled: false
-
-Style/CaseEquality:
-  Enabled: false
-
-Style/DoubleNegation:
-  Enabled: false
-
-Style/GuardClause:
-  Enabled: false
-
-Style/RedundantBegin:
-  Enabled: false
-
-Style/NumericLiterals:
-  Exclude:
-    - 'spec/raven/processors/sanitizedata_processor_spec.rb'
-
-Style/HashSyntax:
-  EnforcedStyle: hash_rockets
-
-Style/IfUnlessModifier:
-  Enabled: false
-
-Lint/RescueException:
-  Exclude:
-    - 'lib/raven/base.rb'
-    - 'lib/raven/instance.rb'
-    - 'lib/raven/integrations/delayed_job.rb'
-    - 'lib/raven/integrations/rack.rb'
-    - 'lib/raven/integrations/sidekiq.rb'
-    - 'spec/raven/event_spec.rb'
-
-Lint/SuppressedException:
-  Enabled: false
-
-Lint/AssignmentInCondition:
-  Enabled: false
-
-Layout/LineLength:
-  Max: 155
-
-Naming/FileName:
-  Exclude:
-    - 'lib/sentry-raven-without-integrations.rb'
-    - 'lib/sentry-raven.rb'
-    - 'lib/raven/integrations/rack-timeout.rb'
-
-Naming/MethodParameterName:
-  Enabled: false
-

data/.scripts/bump-version.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-file_names = ['lib/raven/version.rb']
-
-file_names.each do |file_name|
-  text = File.read(file_name)
-  new_contents = text.gsub(/\d.\d.\d/, ARGV[1])
-  File.open(file_name, "w") {|file| file.puts new_contents }
-end