diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 50b97738f0..f993bdd5a2 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,7 @@ +* Remove `:connection_id` from the `sql.active_record` notification. + + *Aaron Patterson*, *Rafael Mendonça França* + * The `:name` key will no longer be returned as part of `DatabaseConfig#configuration_hash`. Please use `DatabaseConfig#owner_name` instead. *Eileen M. Uchitelle*, *John Crepezzi* diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 9c2b17be1b..b273566cdd 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -678,7 +678,6 @@ module ActiveRecord binds: binds, type_casted_binds: type_casted_binds, statement_name: statement_name, - connection_id: object_id, connection: self) do @lock.synchronize do yield diff --git a/guides/source/active_support_instrumentation.md b/guides/source/active_support_instrumentation.md index 5612de7f20..3ae214ae52 100644 --- a/guides/source/active_support_instrumentation.md +++ b/guides/source/active_support_instrumentation.md @@ -349,7 +349,6 @@ Active Record | -------------------- | ---------------------------------------- | | `:sql` | SQL statement | | `:name` | Name of the operation | -| `:connection_id` | Object ID of the connection object | | `:connection` | Connection object | | `:binds` | Bind parameters | | `:type_casted_binds` | Typecasted bind parameters | @@ -362,7 +361,6 @@ INFO. The adapters will add their own data as well. { sql: "SELECT \"posts\".* FROM \"posts\" ", name: "Post Load", - connection_id: 70307250813140, connection: #, binds: [#], type_casted_binds: [11],