Only keeps greater limit value

Author: st0012

sentry-ruby/lib/sentry/transport/http_transport.rb

@@ -72,7 +72,15 @@ def handle_rate_limited_response(headers)
           { nil => Time.now + DEFAULT_DELAY }
         end
 
-      @rate_limits.merge!(rate_limits)
+      rate_limits.each do |category, limit|
+        if current_limit = @rate_limits[category]
+          if current_limit < limit
+            @rate_limits[category] = limit
+          end
+        else
+          @rate_limits[category] = limit
+        end
+      end
     end
 
     def parse_rate_limit_header(rate_limit_header)

sentry-ruby/spec/sentry/transport/http_transport_rate_limiting_spec.rb

@@ -104,6 +104,36 @@
             end
           end
         end
+
+        context "when receiving a greater value for a present category" do
+          let(:headers) do
+            { "x-sentry-rate-limits" => "120:error:organization" }
+          end
+
+          before do
+            subject.rate_limits.merge!("error" => now + 10)
+          end
+
+          it "overrides the current limit" do
+            send_data_and_verify_response(now)
+            expect(subject.rate_limits).to eq({ "error" => now + 120 })
+          end
+        end
+
+        context "when receiving a smaller value for a present category" do
+          let(:headers) do
+            { "x-sentry-rate-limits" => "10:error:organization" }
+          end
+
+          before do
+            subject.rate_limits.merge!("error" => now + 120)
+          end
+
+          it "keeps the current limit" do
+            send_data_and_verify_response(now)
+            expect(subject.rate_limits).to eq({ "error" => now + 120 })
+          end
+        end
       end
 
       context "with retry-after header" do