Fix context merging #1722 (#1724)

* Fix context merging

When using the same key in a context hash, the new value should
overwrite the old value. Before, the value having been set first would
always win.

fixes #1722

* Add changelog

CHANGELOG.md

@@ -1,3 +1,10 @@
+## Unreleased
+
+### Bug Fixes
+
+- Allow overwriting of context values [#1724](https://github.com/getsentry/sentry-ruby/pull/1724)
+  - Fixes [#1722](https://github.com/getsentry/sentry-ruby/issues/1722)
+
 ## 5.1.0
 
 ### Features

sentry-ruby/lib/sentry/scope.rb

@@ -173,7 +173,7 @@ def set_tag(key, value)
     def set_contexts(contexts_hash)
       check_argument_type!(contexts_hash, Hash)
       @contexts.merge!(contexts_hash) do |key, old, new|
-        new.merge(old)
+        old.merge(new)
       end
     end
 

sentry-ruby/spec/sentry/scope/setters_spec.rb

@@ -109,6 +109,12 @@
       subject.set_contexts({ character: { age: 25 }})
       expect(subject.contexts).to include({ character: { name: "John", age: 25 }})
     end
+
+    it "allows overwriting old values" do
+      subject.set_contexts({ character: { name: "John" }})
+      subject.set_contexts({ character: { name: "Jimmy" }})
+      expect(subject.contexts).to include({ character: { name: "Jimmy" }})
+    end
   end
 
   describe "#set_context" do
@@ -139,6 +145,12 @@
       subject.set_context(:character, { age: 25 })
       expect(subject.contexts).to include({ character: { name: "John", age: 25 }})
     end
+
+    it "allows overwriting old values" do
+      subject.set_context(:character, { name: "John" })
+      subject.set_context(:character, { name: "Jimmy" })
+      expect(subject.contexts).to include({ character: { name: "Jimmy" }})
+    end
   end
 
   describe "#set_tags" do