rollbar 2.19.3 → 2.21.0

data/lib/rollbar/truncation/remove_extra_strategy.rb

@@ -0,0 +1,35 @@
+require 'rollbar/util'
+
+module Rollbar
+  module Truncation
+    class RemoveExtraStrategy
+      include ::Rollbar::Truncation::Mixin
+
+      def self.call(payload)
+        new.call(payload)
+      end
+
+      def call(payload)
+        body = payload['data']['body']
+
+        delete_message_extra(body)
+        delete_trace_chain_extra(body)
+        delete_trace_extra(body)
+
+        dump(payload)
+      end
+
+      def delete_message_extra(body)
+        body['message'].delete('extra') if body['message'] && body['message']['extra']
+      end
+
+      def delete_trace_chain_extra(body)
+        body['trace_chain'][0].delete('extra') if body['trace_chain'] && body['trace_chain'][0]['extra']
+      end
+
+      def delete_trace_extra(body)
+        body['trace'].delete('extra') if body['trace'] && body['trace']['extra']
+      end
+    end
+  end
+end

data/lib/rollbar/truncation/remove_request_strategy.rb

@@ -0,0 +1,21 @@
+require 'rollbar/util'
+
+module Rollbar
+  module Truncation
+    class RemoveRequestStrategy
+      include ::Rollbar::Truncation::Mixin
+
+      def self.call(payload)
+        new.call(payload)
+      end
+
+      def call(payload)
+        data = payload['data']
+
+        data.delete('request') if data['request']
+
+        dump(payload)
+      end
+    end
+  end
+end

data/lib/rollbar/truncation/strings_strategy.rb

@@ -14,13 +14,12 @@ module Rollbar
 
       def call(payload)
         result = nil
-        new_payload = Rollbar::Util.deep_copy(payload)
 
         STRING_THRESHOLDS.each do |threshold|
           truncate_proc = truncate_strings_proc(threshold)
 
-          ::Rollbar::Util.iterate_and_update(new_payload, truncate_proc)
-          result = dump(new_payload)
+          ::Rollbar::Util.iterate_and_update(payload, truncate_proc)
+          result = dump(payload)
 
           break unless truncate?(result)
         end

data/lib/rollbar/util.rb

@@ -63,9 +63,9 @@ module Rollbar
 
     def self.clone_obj(obj)
       if obj.is_a?(::Hash)
-        obj.clone
+        obj.dup
       elsif obj.is_a?(Array)
-        obj.clone.clear
+        obj.dup.clear
       else
         obj
       end

data/lib/rollbar/util/hash.rb

@@ -5,6 +5,7 @@ module Rollbar
         return if seen[hash.object_id]
 
         seen[hash.object_id] = true
+        replace_seen_children(hash, seen)
 
         hash.reduce({}) do |h, (key, value)|
           h[key.to_s] = map_value(value, :deep_stringify_keys, seen)
@@ -22,12 +23,26 @@ module Rollbar
             thing
           else
             seen[thing.object_id] = true
+            replace_seen_children(thing, seen)
             thing.map { |v| map_value(v, meth, seen) }
           end
         else
           thing
         end
       end
+
+      def self.replace_seen_children(thing, seen)
+        case thing
+        when ::Hash
+          thing.keys.each do |key|
+            thing[key] = "removed circular reference: #{thing[key]}" if seen[thing[key].object_id]
+          end
+        when Array
+          thing.each_with_index do |_, i|
+            thing[i] = "removed circular reference: #{thing[i]}" if seen[thing[i].object_id]
+          end
+        end
+      end
     end
   end
 end

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = '2.19.3'.freeze
+  VERSION = '2.21.0'.freeze
 end

data/rollbar.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
   gem.version = Rollbar::VERSION
 
-  gem.add_runtime_dependency 'multi_json'
-
   if gem.respond_to?(:metadata)
     gem.metadata['changelog_uri'] = 'https://github.com/rollbar/rollbar-gem/releases'
     gem.metadata['source_code_uri'] = 'https://github.com/rollbar/rollbar-gem'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 2.19.3
+  version: 2.21.0
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2019-07-12 00:00:00.000000000 Z
+dependencies: []
 description: Easy and powerful exception tracking for Ruby
 email:
 - support@rollbar.com
@@ -59,7 +45,7 @@ files:
 - gemfiles/rails50.gemfile
 - gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
-- gemfiles/ruby_1_8_and_1_9_2.gemfile
+- gemfiles/rails60.gemfile
 - lib/generators/rollbar/rollbar_generator.rb
 - lib/generators/rollbar/templates/initializer.rb
 - lib/rails/rollbar_runner.rb
@@ -88,8 +74,6 @@ files:
 - lib/rollbar/item/locals.rb
 - lib/rollbar/js.rb
 - lib/rollbar/json.rb
-- lib/rollbar/json/default.rb
-- lib/rollbar/json/oj.rb
 - lib/rollbar/language_support.rb
 - lib/rollbar/lazy_store.rb
 - lib/rollbar/logger.rb
@@ -128,6 +112,7 @@ files:
 - lib/rollbar/rails.rb
 - lib/rollbar/rake_tasks.rb
 - lib/rollbar/request_data_extractor.rb
+- lib/rollbar/rollbar_test.rb
 - lib/rollbar/scrubbers.rb
 - lib/rollbar/scrubbers/params.rb
 - lib/rollbar/scrubbers/url.rb
@@ -136,6 +121,9 @@ files:
 - lib/rollbar/truncation/min_body_strategy.rb
 - lib/rollbar/truncation/mixin.rb
 - lib/rollbar/truncation/raw_strategy.rb
+- lib/rollbar/truncation/remove_any_key_strategy.rb
+- lib/rollbar/truncation/remove_extra_strategy.rb
+- lib/rollbar/truncation/remove_request_strategy.rb
 - lib/rollbar/truncation/strings_strategy.rb
 - lib/rollbar/util.rb
 - lib/rollbar/util/hash.rb
@@ -169,7 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Reports exceptions to Rollbar

data/gemfiles/ruby_1_8_and_1_9_2.gemfile

@@ -1,51 +0,0 @@
-require 'rubygems/version'
-
-source 'https://rubygems.org'
-
-is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
-
-gem 'appraisal', '= 1.0.2'
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-gem 'hitimes', '< 1.2.2'
-gem 'jruby-openssl', :platform => :jruby
-gem 'rails', '3.0.20'
-gem 'rake', '< 11'
-gem 'rspec-rails', '>= 2.14.0'
-gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
-
-gem 'oj', '~> 2.12.14' unless is_jruby
-if RUBY_VERSION > '1.8.7' && RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '>= 2.13.0', '< 5.0'
-end
-
-platforms :rbx do
-  gem 'minitest'
-  gem 'racc'
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
-end
-
-if RUBY_VERSION.start_with?('1.9')
-  gem 'celluloid', '< 0.17.0'
-  gem 'sucker_punch', '~> 1.0'
-elsif RUBY_VERSION.start_with?('2')
-  gem 'sucker_punch', '~> 2.0'
-end
-
-gem 'database_cleaner', '~> 1.0.0'
-gem 'delayed_job', '4.1.3', :require => false
-gem 'genspec', '= 0.2.8'
-gem 'girl_friday', '>= 0.11.1'
-gem 'redis', '< 3.3.5'
-gem 'resque', '< 2.0.0'
-gem 'sinatra'
-
-ruby_version = RUBY_VERSION.dup
-
-if Gem::Version.new(ruby_version) < Gem::Version.new('2.0')
-  gem 'mime-types', '< 3.0'
-end
-
-gem 'capistrano', '<= 3.4.1', :require => false
-
-gemspec :path => '../'

data/lib/rollbar/json/default.rb

@@ -1,11 +0,0 @@
-module Rollbar
-  module JSON
-    module Default
-      module_function
-
-      def options
-        {}
-      end
-    end
-  end
-end

data/lib/rollbar/json/oj.rb

@@ -1,16 +0,0 @@
-module Rollbar
-  module JSON
-    module Oj
-      module_function
-
-      def options
-        {
-          :mode => :compat,
-          :use_to_json => false,
-          :symbol_keys => false,
-          :circular => false
-        }
-      end
-    end
-  end
-end