From 435481e9476e13ec3b7df15063a949562eb2adb9 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Fri, 23 Feb 2024 20:58:53 +0100 Subject: [PATCH] chore: drop dependency on ruby2_keywords (#885) Now that Ruby below 2.7 is not supported anymore (#389, https://github.com/open-telemetry/opentelemetry-ruby-contrib/commit/38b083aa41b93bcc8f900cd65bc922c97fe26e5d) this is not needed anymore --- .../instrumentation/active_record/instrumentation.rb | 3 --- .../opentelemetry-instrumentation-active_record.gemspec | 1 - 2 files changed, 4 deletions(-) diff --git a/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/instrumentation.rb b/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/instrumentation.rb index fb8b2f19f..e0d319704 100644 --- a/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/instrumentation.rb +++ b/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/instrumentation.rb @@ -51,9 +51,6 @@ def patch end def require_dependencies - # Our patches depend on Ruby 2 Keyword Syntax compatability since it is decorating the existing AR API - # Once we migrate to ActiveSupport Notifications based instrumentation we can remove this require statement. - require 'ruby2_keywords' # rubocop:disable Lint/RedundantRequireStatement require_relative 'patches/querying' require_relative 'patches/persistence' require_relative 'patches/persistence_class_methods' diff --git a/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec b/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec index 2179dd1b9..bb89086e1 100644 --- a/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec +++ b/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec @@ -27,7 +27,6 @@ Gem::Specification.new do |spec| spec.add_dependency 'opentelemetry-api', '~> 1.0' spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.22.1' - spec.add_dependency 'ruby2_keywords' spec.add_development_dependency 'activerecord', '>= 6.1' spec.add_development_dependency 'appraisal', '~> 2.5'