Merge pull request #566 from bugsnag/next

Release 6.12.1
bugsnag · Sep 5, 2019 · c8d9f4e · c8d9f4e
2 parents 2fbc548 + 0e704d3
commit c8d9f4e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,17 @@
 Changelog
 =========
 
+## 6.12.1 (05 Sep 2019)
+
+### Fixes
+
+* Account for missing `:binds` key in `sql.active_record` ActiveSupport notifications.
+  | [#555](https://github.com/bugsnag/bugsnag-ruby/issues/555)
+  | [#565](https://github.com/bugsnag/bugsnag-ruby/pull/565)
+* Remove duplicate attribute declaration warning for `track_sessions` in Configuration.
+  | [#510](https://github.com/bugsnag/bugsnag-ruby/pull/510)
+  | [pocke](https://github.com/pocke)
+
 ## 6.12.0 (28 Aug 2019)
 
 ### Enhancements

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.12.0
+6.12.1
diff --git a/lib/bugsnag/configuration.rb b/lib/bugsnag/configuration.rb
@@ -37,7 +37,6 @@ class Configuration
     attr_accessor :runtime_versions
     attr_accessor :ignore_classes
     attr_accessor :auto_capture_sessions
-    attr_accessor :track_sessions
 
     ##
     # @return [String] URL error notifications will be delivered to

diff --git a/lib/bugsnag/integrations/railtie.rb b/lib/bugsnag/integrations/railtie.rb
@@ -79,7 +79,7 @@ def event_subscription(event)
         filtered_data = data.slice(*event[:allowed_data])
         filtered_data[:event_name] = event[:id]
         filtered_data[:event_id] = event_id
-        if event[:id] == "sql.active_record"
+        if event[:id] == "sql.active_record" && data.key?(:binds)
           binds = data[:binds].each_with_object({}) { |bind, output| output[bind.name] = '?' if defined?(bind.name) }
           filtered_data[:binds] = JSON.dump(binds) unless binds.empty?
         end