opentelemetry-instrumentation-active_record 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7a6f6f2293fab71fe0facfdab2f4a4205863003948478dd0b044ff5bf1d21fa
-  data.tar.gz: 818b0b61d55fc8ed30fd6fe83574972192e88735d236bb4f0ec6b1c804fdecf8
+  metadata.gz: 67b8da082c839d837448ed0f6499d5c00cb86a8d6bb584880f567fa3384dd1bc
+  data.tar.gz: e8627c074ca2199d351c410243f37ae5449083ec7b66d97db7064ff7e166dea1
 SHA512:
-  metadata.gz: 55138e1121cf7046e568064813278e418e841d2237d413693691227e7ad68c124a483ea5e9dcc9574bdbba74b357ccedf4a4ced6410b067898c3219c3432de6e
-  data.tar.gz: dce74f0cdcd97121d429f540d0fe22f7b5be183db5edd64e165799699fd8cf62f0715e95df4588a5a9acace9927d89f4c7822662fad1b05b42e07e828e9474cf
+  metadata.gz: 81c4bbd63bf5d9b758b979fbdbd6614f6a424e79a75a117665ceafa9f299383eab3b6cf003e7f026f66434e5b83f4551573573d269c09e3d9977e72ab08e2b63
+  data.tar.gz: 3ff550d432c33eb06a2b0322042af53dd0773d731026067061d380cd2c6767f9596051a22fb8cd889907fa8e035872f6ad1b9135f04f3e7c636a78d9bf4b8add

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Release History: opentelemetry-instrumentation-active_record
 
+### v0.4.0 / 2022-06-09
+
+* Upgrading Base dependency version
+* FIXED: Broken test file requirements 
+
+### 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)

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.1'
+      VERSION = '0.4.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.1
+  version: 0.4.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -30,14 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.3
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.3
+        version: 0.21.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
@@ -100,14 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-test-helpers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -219,10 +247,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.1/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-active_record/v0.4.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.1
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-active_record/v0.4.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -231,7 +259,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="