opentelemetry-instrumentation-active_record 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a55434976a5ba204e32e46913ee4ab5a7653060e18fb22b87b28cd2551d4b8f2
-  data.tar.gz: 71fc97b9d03c4952c2fb6e2325158aa0f4045c1c3766f60058927d5f251d090c
+  metadata.gz: 6a0a2a81d85b0b8ebcfde872b4fe3b4f9b85426624952c0882ed1a6e22530bd4
+  data.tar.gz: ba39f10def3f05ed1578b1e555bbf1083d0dbdcd30bec5225db1e8f5c383941b
 SHA512:
-  metadata.gz: 7d88fe43aba0a4887b95e1fe5600fcc365222597e539f0bfca8ea21206f0480558bec5e3f398719e7142e6d2e4b6770e7a89ead4acbda3a19280173f89f186cf
-  data.tar.gz: f00e3bf14b7b1b84d4d25e0cc4707366078cf0bccb0400e268b0864c69f4983ef654890167ebc376999afdaf3f88565a1376ecb8eff80c4b36059e2eea1a74f6
+  metadata.gz: 0a85a6c8454213a2d5fc059cb136b6e294e9976f900df85ae938942538d41768c9ab95bee5a1e96af6c283a39c126d18572cedc20e7f62a69eb4dce496f589e1
+  data.tar.gz: 071ce33dd775bdcbf2d34d0da122d38b80589314ae39ed8859876527d8fa59d855a2ffc7a1e4486098ac16051aa55c96672085bb591d6c97a871ef4902c41a17

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Release History: opentelemetry-instrumentation-active_record
 
+### v0.3.0 / 2022-05-02
+
+* ADDED: Make ActiveRecord 7 compatible 
+* FIXED: RubyGems Fallback 
+
+### v0.2.2 / 2021-12-01
+
+* FIXED: Add max supported version for active record 
+
+### v0.2.1 / 2021-09-29
+
+* (No significant changes)
+
 ### v0.2.0 / 2021-09-29
 
 * ADDED: Trace update_all and delete_all calls in ActiveRecord 

data/lib/opentelemetry/instrumentation/active_record/instrumentation.rb

@@ -10,6 +10,7 @@ module OpenTelemetry
       # The Instrumentation class contains logic to detect and install the ActiveRecord instrumentation
       class Instrumentation < OpenTelemetry::Instrumentation::Base
         MINIMUM_VERSION = Gem::Version.new('5.2.0')
+        MAX_MAJOR_VERSION = 7
 
         install do |_config|
           require_dependencies
@@ -21,7 +22,11 @@ module OpenTelemetry
         end
 
         compatible do
-          gem_version >= MINIMUM_VERSION
+          # We know that releases after MAX_MAJOR_VERSION are unstable so we
+          # check the major version number of the gem installed to make sure we
+          # do not install on a pre-release or full release of the latest
+          # if it exceeds the MAX_MAJOR_VERSION version.
+          gem_version >= MINIMUM_VERSION && gem_version.segments[0] <= MAX_MAJOR_VERSION
         end
 
         private
@@ -31,7 +36,7 @@ module OpenTelemetry
         end
 
         def gem_version
-          Gem.loaded_specs['activerecord'].version
+          ::ActiveRecord.version
         end
 
         def patch
@@ -55,6 +60,7 @@ module OpenTelemetry
         end
 
         def require_dependencies
+          require 'ruby2_keywords'
           require_relative 'patches/querying'
           require_relative 'patches/persistence'
           require_relative 'patches/persistence_class_methods'

data/lib/opentelemetry/instrumentation/active_record/patches/persistence_insert_class_methods.rb

@@ -3,7 +3,6 @@
 # Copyright The OpenTelemetry Authors
 #
 # SPDX-License-Identifier: Apache-2.0
-
 module OpenTelemetry
   module Instrumentation
     module ActiveRecord
@@ -19,39 +18,39 @@ module OpenTelemetry
 
           # Contains ActiveRecord::Persistence::ClassMethods to be patched
           module ClassMethods
-            def insert(attributes, returning: nil, unique_by: nil)
+            ruby2_keywords def insert(*args)
               tracer.in_span("#{self}.insert") do
-                super
+                super(*args)
               end
             end
 
-            def insert_all(attributes, returning: nil, unique_by: nil)
+            ruby2_keywords def insert_all(*args)
               tracer.in_span("#{self}.insert_all") do
-                super
+                super(*args)
               end
             end
 
-            def insert!(attributes, returning: nil)
+            ruby2_keywords def insert!(*args)
               tracer.in_span("#{self}.insert!") do
-                super
+                super(*args)
               end
             end
 
-            def insert_all!(attributes, returning: nil)
+            ruby2_keywords def insert_all!(*args)
               tracer.in_span("#{self}.insert_all!") do
-                super
+                super(*args)
               end
             end
 
-            def upsert(attributes, returning: nil, unique_by: nil)
+            ruby2_keywords def upsert(*args)
               tracer.in_span("#{self}.upsert") do
-                super
+                super(*args)
               end
             end
 
-            def upsert_all(attributes, returning: nil, unique_by: nil)
+            ruby2_keywords def upsert_all(*args)
               tracer.in_span("#{self}.upsert_all") do
-                super
+                super(*args)
               end
             end
 

data/lib/opentelemetry/instrumentation/active_record/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActiveRecord
-      VERSION = '0.2.0'
+      VERSION = '0.3.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-active_record
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-base
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: 0.20.0
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +112,16 @@ dependencies:
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -219,10 +233,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-active_record/v0.2.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-active_record/v0.3.0/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/active_record
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-active_record/v0.2.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-active_record/v0.3.0
 post_install_message: 
 rdoc_options: []
 require_paths: