appsignal 3.0.24-java → 3.0.25-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa21a9008de8449831a37ad9605367b86e8fb27e480a215108229217a65134a
-  data.tar.gz: 9b2ed342eb75461e8c19788789ca254dadbfc6d97ec1eb226438d3c4b91c25c2
+  metadata.gz: deaef7e2168cb358393f26888084c1ea47efd1a370022a74a751c12b3d2a5f05
+  data.tar.gz: b8df7d9e2c01c03797a17e253dcb1cd54ed5df50b533deb4a91e94c5cdf7a3f8
 SHA512:
-  metadata.gz: eda047de46e8396a5682cda200980f92dfd0769e0f12ec4eb60a140fa8e594297d4181c840d20d62164f1b64498e829f8df23caf6cbe6541525d2f601f44f21c
-  data.tar.gz: 7c7a6df9b85a50d3f56853a5ba3f7412a09a68312db3703a7c4937afa440157fc04a4b6931184f1039d5fbb22b37c35e346f88a2f917ee032cb7aea32de2868c
+  metadata.gz: f760735aa2fffb0680e00f5b8bc771a9d6ff22bcdb4e13f7bbba0753ae5390ac35d6b9ecc49a388e3290ad2d53fe392e5f5b9a1fc73d1c6f6a52887f93a6ccbc
+  data.tar.gz: 17ff605c14abb3363494062533d33d52f0c64b53c01e9f8a700ecf8d8d22dcdb5f0e55b2be6db9a34b1233d9b2da65dc85ce9227df8d148d49dd5d33492686f8

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.0.25
+
+### Added
+
+- [399cf790](https://github.com/appsignal/appsignal-ruby/commit/399cf79044e7c8936ab72dce420d91af4cb71d16) patch - Sanitize `ActiveRecord::RecordNotUnique` error messages to not include any database values that is not unique in the database. This ensures no personal information is sent to AppSignal through error messages from this error.
+
 ## 3.0.24
 
 ### Changed

data/lib/appsignal/transaction.rb

@@ -537,7 +537,7 @@ module Appsignal
     # Returns an unchanged message otherwise.
     def cleaned_error_message(error)
       case error.class.to_s
-      when "PG::UniqueViolation"
+      when "PG::UniqueViolation", "ActiveRecord::RecordNotUnique"
         error.message.to_s.gsub(/\)=\(.*\)/, ")=(?)")
       else
         error.message.to_s

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "3.0.24".freeze
+  VERSION = "3.0.25".freeze
 end

data/spec/lib/appsignal/integrations/sidekiq_spec.rb

@@ -376,7 +376,7 @@ if DependencyHelper.active_job_present?
       ]
     end
     let(:expected_wrapped_args) do
-      if (DependencyHelper.rails6_1_present? && DependencyHelper.ruby_3_1_or_newer?) || DependencyHelper.rails7_present?
+      if DependencyHelper.active_job_wraps_args?
         [{
           "_aj_ruby2_keywords" => ["args"],
           "args" => expected_args

data/spec/lib/appsignal/transaction_spec.rb

@@ -1350,8 +1350,8 @@ describe Appsignal::Transaction do
     end
 
     context "with a PG::UniqueViolation" do
-      module PG
-        class UniqueViolation < StandardError; end
+      before do
+        stub_const("PG::UniqueViolation", Class.new(StandardError))
       end
 
       let(:error) do
@@ -1364,6 +1364,25 @@ describe Appsignal::Transaction do
         expect(subject).to eq "ERROR: duplicate key value violates unique constraint \"index_users_on_email\" DETAIL: Key (email)=(?) already exists."
       end
     end
+
+    context "with a ActiveRecord::RecordNotUnique" do
+      before do
+        stub_const("ActiveRecord::RecordNotUnique", Class.new(StandardError))
+      end
+
+      let(:error) do
+        ActiveRecord::RecordNotUnique.new(
+          "PG::UniqueViolation: ERROR: duplicate key value violates unique constraint \"example_constraint\"\n" \
+          "DETAIL: Key (email)=(foo@example.com) already exists."
+        )
+      end
+
+      it "returns a sanizited error message" do
+        expect(subject).to eq \
+          "PG::UniqueViolation: ERROR: duplicate key value violates unique constraint \"example_constraint\"\n" \
+          "DETAIL: Key (email)=(?) already exists."
+      end
+    end
   end
 
   describe ".to_hash / .to_h" do

data/spec/support/helpers/activejob_helpers.rb

@@ -1,6 +1,6 @@
 module ActiveJobHelpers
   def active_job_args_wrapper(args: [], params: nil)
-    if (DependencyHelper.rails6_1_present? && DependencyHelper.ruby_3_1_or_newer?) || DependencyHelper.rails7_present?
+    if DependencyHelper.active_job_wraps_args?
       wrapped_args = {}
 
       if params

data/spec/support/helpers/dependency_helper.rb

@@ -29,10 +29,18 @@ module DependencyHelper
     rails_present? && rails_version >= Gem::Version.new("6.1.0")
   end
 
+  def rails6_1_5_present?
+    rails_present? && rails_version >= Gem::Version.new("6.1.5")
+  end
+
   def rails7_present?
     rails_present? && rails_version >= Gem::Version.new("7.0.0")
   end
 
+  def active_job_wraps_args?
+    rails7_present? || (ruby_3_1_or_newer? && rails6_1_present? && !rails6_1_5_present?)
+  end
+
   def rails_version
     Gem.loaded_specs["rails"].version
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.0.24
+  version: 3.0.25
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-24 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack