rollbar 2.20.0 → 2.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e879b78b311e11b9d124caf5d30c8dc9e0d831409a80459430fd557320926cbf
-  data.tar.gz: 5baf629685d3393055192355cf4974321004ed0a3e57b13f045eafe6631e4804
+  metadata.gz: 026a0a98287641d8695b930dc08f7adbd1581db6e2b294ecbccc833b508e1274
+  data.tar.gz: 8c382057788fbe095a59581fcb7e67f0031ca3a134846ea9dfa96a8f0a7eac30
 SHA512:
-  metadata.gz: 69e943c6de574b2589a3230fdf69159e0378066fb2ec9757e9716f4c839273ec97450d11058dfdd250b7e244e9d70f28bfb0799916b9765e797e5f5ecccbd022
-  data.tar.gz: 5213c8cd89294bd2ab4ac1e2ac9dacb43165449bed85d4dc7b8eae9d6f1b4beb1ac95e7526f5d2e11eb7633e2969c62330f577150732207e11004464384c8a2a
+  metadata.gz: 70090a6a9eb74ee019ef307efb9fd5b2f61e96f59385a36bf63f952f187ec34d5f63f5b1f2d888a815eb079962a7b1c66d227349a01a8e4509801e7ad5118f95
+  data.tar.gz: 78060e237ee0dad7d0e0e5a5ccb22ecd74e5b936cbaed148bc5e2f2142a61d1d6180bcbeb2dece8f28692c8a7dff2695256ee397097e06cc7e567c4cc63fa50a

data/lib/rollbar/item.rb

@@ -121,7 +121,7 @@ module Rollbar
       host = stringified_payload['data'].fetch('server', {})['host']
 
       notifier.send_failsafe(
-        too_large_payload_string(stringified_payload, final_payload, attempts),
+        too_large_payload_string(attempts),
         nil,
         uuid,
         host
@@ -129,12 +129,9 @@ module Rollbar
       logger.error("[Rollbar] Payload too large to be sent for UUID #{uuid}: #{Rollbar::JSON.dump(payload)}")
     end
 
-    def too_large_payload_string(stringified_payload, final_payload, attempts)
-      original_size = Rollbar::JSON.dump(stringified_payload).bytesize
-      final_size = final_payload.bytesize
-
+    def too_large_payload_string(attempts)
       'Could not send payload due to it being too large after truncating attempts. ' \
-        "Original size: #{original_size} Attempts: #{attempts.join(', ')} Final size: #{final_size}"
+        "Original size: #{attempts.first} Attempts: #{attempts.join(', ')} Final size: #{attempts.last}"
     end
 
     def ignored?

data/lib/rollbar/truncation.rb

@@ -4,6 +4,8 @@ require 'rollbar/truncation/raw_strategy'
 require 'rollbar/truncation/frames_strategy'
 require 'rollbar/truncation/strings_strategy'
 require 'rollbar/truncation/min_body_strategy'
+require 'rollbar/truncation/remove_request_strategy'
+require 'rollbar/truncation/remove_extra_strategy'
 
 module Rollbar
   module Truncation
@@ -13,7 +15,9 @@ module Rollbar
     STRATEGIES = [RawStrategy,
                   FramesStrategy,
                   StringsStrategy,
-                  MinBodyStrategy].freeze
+                  MinBodyStrategy,
+                  RemoveRequestStrategy,
+                  RemoveExtraStrategy].freeze
 
     def self.truncate(payload, attempts = [])
       result = nil

data/lib/rollbar/truncation/min_body_strategy.rb

@@ -11,8 +11,7 @@ module Rollbar
       end
 
       def call(payload)
-        new_payload = Rollbar::Util.deep_copy(payload)
-        body = new_payload['data']['body']
+        body = payload['data']['body']
 
         if body['trace_chain']
           body['trace_chain'] = body['trace_chain'].map do |trace_data|
@@ -22,7 +21,7 @@ module Rollbar
           body['trace'] = truncate_trace_data(body['trace'])
         end
 
-        dump(new_payload)
+        dump(payload)
       end
 
       def truncate_trace_data(trace_data)

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

@@ -6,7 +6,7 @@ module Rollbar
     class StringsStrategy
       include ::Rollbar::Truncation::Mixin
 
-      STRING_THRESHOLDS = [1024, 512, 256, 128, 64].freeze
+      STRING_THRESHOLDS = [1024, 512, 256].freeze
 
       def self.call(payload)
         new.call(payload)
@@ -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/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = '2.20.0'.freeze
+  VERSION = '2.20.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 2.20.0
+  version: 2.20.1
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-25 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -136,6 +136,8 @@ files:
 - lib/rollbar/truncation/min_body_strategy.rb
 - lib/rollbar/truncation/mixin.rb
 - lib/rollbar/truncation/raw_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