appoptics_apm 4.0.9 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a51f0eb046ed02b1a7a348d9fe94bd2032346610
-  data.tar.gz: fe218ed8a4c12fa99467c38fe90263e16c25bfc9
+  metadata.gz: 90ed895e7d5acf3fb30fa85e0d5df0a3df0d3075
+  data.tar.gz: acf370948b698d06dfe982a322058d2bb2e227eb
 SHA512:
-  metadata.gz: f26600d8d87550401be000a90d062a9eed4bbb317312be5383d04ab92f9fdc612f36da5d9d90d56a94cebaec41fd516b4aa2721a8b86676c1be1a88d89512343
-  data.tar.gz: 86fa8448ef415190e497d79be22dd19623d54c9ca5865d3f01d0029e7847618894ca44f57c91eb874917cca0c9b42b84c9572823aff25654be8fc0a5c6923108
+  metadata.gz: 26c3753688ed6e8568b9c4ced5364505bde26cccfbf0b7ce53adb55ea5dd703de3427c7b68f96fe9845726d04c3049422c30feb686bd76791e5590467c70ca87
+  data.tar.gz: 8cdc020d21282e659a2fc8c82066f9975641f45a82735fc628e94e11dbf6cfc5ca0b35115e3ef3012be37daa32e05de733799d0d88f4470c03a925faeda62c00

data/.gitignore

@@ -15,7 +15,6 @@ ext/oboe_metal/src/oboe.h
 ext/oboe_metal/src/oboe.hpp
 ext/oboe_metal/src/oboe_debug.h
 ext/oboe_metal/src/oboe_wrap.cxx
-ext/oboe_metal/src/VERSION
 log/
 .vagrant
 gemfiles/.bundle

data/.travis.yml

@@ -9,7 +9,6 @@ rvm:
   - 2.5.0
   - 2.4.3
   - 2.3.6
-  - 1.9.3 # soon not supported anymore
 #  - jruby-9.0.5.0
 
 gemfile:
@@ -71,18 +70,6 @@ matrix:
     - rvm: 2.4.3
       gemfile: gemfiles/rails32.gemfile
 
-    # Rails 5 requires Ruby >= 2.2
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails50.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails51.gemfile
-
-    # WebMock requires Ruby 2.0 or higher
-    - rvm: 1.9.3
-      gemfile: gemfiles/instrumentation_mocked.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/instrumentation_mocked_oldgems.gemfile
-
 #    - rvm: jruby-9.0.5.0
 #      gemfile: gemfiles/delayed_job.gemfile
 

data/Dockerfile_test

@@ -9,6 +9,7 @@ RUN apt-get update \
        git-core \
        libpcre3-dev \
        libreadline-dev \
+       libsasl2-dev \
        libssl-dev \
        openjdk-8-jdk \
        zlib1g-dev \
@@ -32,7 +33,6 @@ RUN  git clone https://github.com/rbenv/rbenv.git ~/.rbenv \
 
 # install rubies to build our gem against
 RUN . ~/.profile \
-    && rbenv install 1.9.3-p551 \
     && rbenv install 2.3.6 \
     && rbenv install 2.4.3 \
     && rbenv install 2.5.0

data/Gemfile

@@ -7,11 +7,7 @@ group :development, :test do
   gem 'minitest-debugger', :require => false
   gem 'rack-test'
   gem 'puma'
-  if RUBY_VERSION < '1.9.3'
-    gem 'bson', '<= 1.12.3'
-  else
-    gem 'bson'
-  end
+  gem 'bson'
   gem 'webmock' if RUBY_VERSION >= '2.0.0'
   gem 'mocha'
   gem 'rubocop', require: false
@@ -24,12 +20,8 @@ group :development do
   gem 'debugger',     :platform  =>  :mri_19
   gem 'byebug',       :platforms => [:mri_20, :mri_21, :mri_22, :mri_23, :mri_24]
   #  gem 'perftools.rb', :platforms => [ :mri_20, :mri_21 ], :require => 'perftools'
-  if RUBY_VERSION >= '2.0.0'
-    gem 'pry'
-    gem 'pry-byebug', :platforms => [:mri_20, :mri_21, :mri_22, :mri_23, :mri_24]
-  else
-    gem 'pry', '~> 0.10.0'
-  end
+  gem 'pry'
+  gem 'pry-byebug', :platforms => [:mri_20, :mri_21, :mri_22, :mri_23, :mri_24]
 end
 
 if defined?(JRUBY_VERSION)

data/Rakefile

@@ -73,7 +73,7 @@ task :fetch_ext_deps do
   end
 
   # The c-lib version is different from the gem version
-  oboe_version = ENV['OBOE_VERSION'] || '2.0.9'
+  oboe_version = ENV['OBOE_VERSION'] || 'latest'
   oboe_src_dir = "https://s3-us-west-2.amazonaws.com/rc-files-t2/c-lib/#{oboe_version}"
   ext_src_dir = File.expand_path('ext/oboe_metal/src')
 

data/appoptics_apm.gemspec

@@ -29,23 +29,17 @@ Gem::Specification.new do |s|
   s.extensions = ['ext/oboe_metal/extconf.rb'] unless defined?(JRUBY_VERSION)
 
   s.add_runtime_dependency('json', '>= 0')
-  s.add_runtime_dependency('no_proxy_fix', '~> 0.1.2', '>= 0.1.2')
 
   # Development dependencies used in gem development & testing
   s.add_development_dependency('rake', '>= 0.9.0')
 
   unless defined?(JRUBY_VERSION)
-    case RUBY_VERSION
-    when /^1\.9/
-      s.add_development_dependency('pry-debugger', '>= 0.2.3')
-    when /^2\./
-      s.add_development_dependency('byebug', '>= 8.0.0')
-      s.add_development_dependency('pry', '>= 0.10.0')
-      s.add_development_dependency('pry-byebug', '>= 3.0.0')
-    end
+    s.add_development_dependency('byebug', '>= 8.0.0')
+    s.add_development_dependency('pry', '>= 0.10.0')
+    s.add_development_dependency('pry-byebug', '>= 3.0.0')
   else
     s.add_development_dependency('pry', '>= 0.10.0')
   end
 
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0.0'
 end

data/examples/tracing_background_jobs.rb

@@ -15,7 +15,7 @@ AppOpticsAPM::Config[:tracing_mode] = 'always'
 # and doesn't have to be called manually
 #
 # Load library instrumentation to auto-capture stuff we know about...
-# e.g. ActiveRecord, Cassandra, Dalli, Redis, memcache, mongo
+# e.g. ActiveRecord, Cassandra, Dalli, Redis, Memcache, Mongo
 # AppOpticsAPM::Ruby.load
 
 # Some KVs to report to the dashboard

data/ext/oboe_metal/extconf.rb

@@ -4,9 +4,7 @@
 require 'mkmf'
 require 'rbconfig'
 require 'open-uri'
-require 'no_proxy_fix'
-
-# require 'digest'
+require 'digest'
 
 ext_dir = File.expand_path(File.dirname(__FILE__))
 
@@ -20,7 +18,7 @@ ao_include = File.join(ext_dir, 'src')
 
 # Download the appropriate liboboe from S3(via rake for testing) or files.appoptics.com (production)
 version = File.read(File.join(ao_include, 'VERSION')).chomp
-if ENV['APPOPTICS_FROM_S3'].to_s.downcase == 'true'
+if ENV['FROM_S3']
   ao_path = File.join('https://s3-us-west-2.amazonaws.com/rc-files-t2/c-lib/', version)
   puts "Fetching c-lib from S3"
 else
@@ -80,7 +78,6 @@ if success
 
   dir_config('oboe', 'src', 'lib')
 
-  # create Makefile
   if jruby || ENV.key?('APPOPTICS_URL')
     # Build the noop extension under JRuby and Heroku.
     # The oboe-heroku gem builds it's own c extension which links to

data/ext/oboe_metal/src/VERSION

@@ -0,0 +1 @@
+2.0.9

data/lib/appoptics_apm/api/memcache.rb

@@ -9,6 +9,7 @@ module AppOpticsAPM
   module API
     ##
     # Utility methods for the Memcache instrumentation
+    # currently used by dalli and memcached
     module Memcache #:nodoc:
       MEMCACHE_OPS = %w(add append cas decr decrement delete fetch get incr increment prepend replace set)
 

data/lib/appoptics_apm/api/profiling.rb

@@ -85,11 +85,7 @@ module AppOpticsAPM
         # like we did something to nicely play the no-op part.
         return true unless AppOpticsAPM.loaded
 
-        if RUBY_VERSION < '1.9.3'
-          AppOpticsAPM.logger.warn '[appoptics_apm/error] profile_method: Use the legacy method profiling for Ruby versions before 1.9.3'
-          return false
-
-        elsif !klass.is_a?(Module)
+        if !klass.is_a?(Module)
           AppOpticsAPM.logger.warn "[appoptics_apm/error] profile_method: Not sure what to do with #{klass}.  Send a class or module."
           return false
 

data/lib/appoptics_apm/base.rb

@@ -193,25 +193,21 @@ module AppOpticsAPMBase
     env = ENV['RACK_ENV'] || ENV['RAILS_ENV']
     return unless %w(development, test).include? env
 
-    if RUBY_VERSION > '1.9.3'
-      require 'pry'
-      require 'pry-byebug'
-
-      if defined?(PryByebug)
-        Pry.commands.alias_command 'c', 'continue'
-        Pry.commands.alias_command 's', 'step'
-        Pry.commands.alias_command 'n', 'next'
-        Pry.commands.alias_command 'f', 'finish'
-
-        Pry::Commands.command(/^$/, 'repeat last command') do
-          _pry_.run_command Pry.history.to_a.last
-        end
-      end
+    require 'pry'
+    require 'pry-byebug'
 
-      byebug
-    else
-      require 'ruby-debug'; debugger
+    if defined?(PryByebug)
+      Pry.commands.alias_command 'c', 'continue'
+      Pry.commands.alias_command 's', 'step'
+      Pry.commands.alias_command 'n', 'next'
+      Pry.commands.alias_command 'f', 'finish'
+
+      Pry::Commands.command(/^$/, 'repeat last command') do
+        _pry_.run_command Pry.history.to_a.last
+      end
     end
+
+    byebug
   end
 
   ##

data/lib/appoptics_apm/config.rb

@@ -15,8 +15,7 @@ module AppOpticsAPM
                          :active_record, :bunnyclient, :bunnyconsumer, :cassandra, :curb,
                          :dalli, :delayed_jobclient, :delayed_jobworker,
                          :em_http_request, :excon, :faraday, :grape,
-                         :httpclient, :nethttp, :memcached,
-                         :memcache, :mongo, :moped, :rack, :redis,
+                         :httpclient, :nethttp, :memcached, :mongo, :moped, :rack, :redis,
                          :resqueclient, :resqueworker, :rest_client,
                          :sequel, :sidekiqclient, :sidekiqworker, :typhoeus]
 
@@ -66,7 +65,6 @@ module AppOpticsAPM
       AppOpticsAPM::Config[:faraday][:collect_backtraces] = false
       AppOpticsAPM::Config[:grape][:collect_backtraces] = true
       AppOpticsAPM::Config[:httpclient][:collect_backtraces] = true
-      AppOpticsAPM::Config[:memcache][:collect_backtraces] = false
       AppOpticsAPM::Config[:memcached][:collect_backtraces] = false
       AppOpticsAPM::Config[:mongo][:collect_backtraces] = true
       AppOpticsAPM::Config[:moped][:collect_backtraces] = true

data/lib/appoptics_apm/inst/curb.rb

@@ -321,7 +321,7 @@ module AppOpticsAPM
   end
 end
 
-if AppOpticsAPM::Config[:curb][:enabled] && defined?(::Curl) && RUBY_VERSION > '1.8.7'
+if AppOpticsAPM::Config[:curb][:enabled] && defined?(::Curl)
   ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting curb' if AppOpticsAPM::Config[:verbose]
   ::AppOpticsAPM::Util.send_include(::Curl::Easy, ::AppOpticsAPM::Inst::CurlEasy)
   ::AppOpticsAPM::Util.send_extend(::Curl::Multi, ::AppOpticsAPM::Inst::CurlMultiCM)

data/lib/appoptics_apm/inst/dalli.rb

@@ -12,7 +12,8 @@ module AppOpticsAPM
           if ::Dalli::Client.private_method_defined? :perform
             alias perform_without_appoptics perform
             alias perform perform_with_appoptics
-          else AppOpticsAPM.logger.warn '[appoptics_apm/loading] Couldn\'t properly instrument Memcache (Dalli).  Partial traces may occur.'
+          else
+            AppOpticsAPM.logger.warn '[appoptics_apm/loading] Couldn\'t properly instrument Memcache (Dalli).  Partial traces may occur.'
           end
 
           if ::Dalli::Client.method_defined? :get_multi

data/lib/appoptics_apm/inst/em-http-request.rb

@@ -76,30 +76,28 @@ module AppOpticsAPM
   end
 end
 
-if RUBY_VERSION >= '1.9'
-  if defined?(::EventMachine::HttpConnection) && defined?(::EventMachine::HttpClient) && AppOpticsAPM::Config[:em_http_request][:enabled]
-    AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting em-http-request' if AppOpticsAPM::Config[:verbose]
-
-    class ::EventMachine::HttpConnection
-      include AppOpticsAPM::Inst::EventMachine::HttpConnection
-
-      if method_defined?(:setup_request)
-        class_eval 'alias :setup_request_without_appoptics :setup_request'
-        class_eval 'alias :setup_request :setup_request_with_appoptics'
-      else
-        AppOpticsAPM.logger.warn '[appoptics_apm/loading] Couldn\'t properly instrument em-http-request (:setup_request).  Partial traces may occur.'
-      end
+if defined?(::EventMachine::HttpConnection) && defined?(::EventMachine::HttpClient) && AppOpticsAPM::Config[:em_http_request][:enabled]
+  AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting em-http-request' if AppOpticsAPM::Config[:verbose]
+
+  class ::EventMachine::HttpConnection
+    include AppOpticsAPM::Inst::EventMachine::HttpConnection
+
+    if method_defined?(:setup_request)
+      class_eval 'alias :setup_request_without_appoptics :setup_request'
+      class_eval 'alias :setup_request :setup_request_with_appoptics'
+    else
+      AppOpticsAPM.logger.warn '[appoptics_apm/loading] Couldn\'t properly instrument em-http-request (:setup_request).  Partial traces may occur.'
     end
+  end
 
-    class ::EventMachine::HttpClient
-      include AppOpticsAPM::Inst::EventMachine::HttpClient
+  class ::EventMachine::HttpClient
+    include AppOpticsAPM::Inst::EventMachine::HttpClient
 
-      if method_defined?(:parse_response_header)
-        class_eval 'alias :parse_response_header_without_appoptics :parse_response_header'
-        class_eval 'alias :parse_response_header :parse_response_header_with_appoptics'
-      else
-        AppOpticsAPM.logger.warn '[appoptics_apm/loading] Couldn\'t properly instrument em-http-request (:parse_response_header).  Partial traces may occur.'
-      end
+    if method_defined?(:parse_response_header)
+      class_eval 'alias :parse_response_header_without_appoptics :parse_response_header'
+      class_eval 'alias :parse_response_header :parse_response_header_with_appoptics'
+    else
+      AppOpticsAPM.logger.warn '[appoptics_apm/loading] Couldn\'t properly instrument em-http-request (:parse_response_header).  Partial traces may occur.'
     end
   end
 end

data/lib/appoptics_apm/inst/excon.rb

@@ -20,15 +20,7 @@ module AppOpticsAPM
         # Conditionally log query args
         if AppOpticsAPM::Config[:excon][:log_args] && @data[:query]
           if @data[:query].is_a?(Hash)
-            if RUBY_VERSION >= '1.9.2'
-              kvs[:ServiceArg] = "#{@data[:path]}?#{URI.encode_www_form(@data[:query])}"
-            else
-              # An imperfect solution for the lack of URI.encode_www_form for Ruby versions before
-              # 1.9.2.  We manually create a query string for reporting purposes only.
-              query_arg = ""
-              @data[:query].each_pair { |k,v| query_arg += "#{k}=#{v}?"; }
-              kvs[:ServiceArg] = "#{@data[:path]}?#{query_arg.chop}"
-            end
+            kvs[:ServiceArg] = "#{@data[:path]}?#{URI.encode_www_form(@data[:query])}"
           else
             kvs[:ServiceArg] = "#{@data[:path]}?#{@data[:query]}"
           end

data/lib/appoptics_apm/inst/mongo2.rb

@@ -3,7 +3,7 @@
 
 require 'json'
 
-if RUBY_VERSION >= '1.9' && AppOpticsAPM::Config[:mongo][:enabled]
+if AppOpticsAPM::Config[:mongo][:enabled]
   if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s >= '2.0.0')
     ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting mongo' if AppOpticsAPM::Config[:verbose]
 

data/lib/appoptics_apm/inst/resque.rb

@@ -138,7 +138,7 @@ module AppOpticsAPM
   end
 end
 
-if defined?(::Resque) && RUBY_VERSION >= '1.9.3'
+if defined?(::Resque)
   AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting resque' if AppOpticsAPM::Config[:verbose]
 
   ::AppOpticsAPM::Util.send_include(::Resque,         ::AppOpticsAPM::Inst::ResqueClient) if AppOpticsAPM::Config[:resqueclient][:enabled]

data/lib/appoptics_apm/inst/sidekiq-client.rb

@@ -43,7 +43,7 @@ module AppOpticsAPM
   end
 end
 
-if defined?(::Sidekiq) && RUBY_VERSION >= '2.0' && AppOpticsAPM::Config[:sidekiqclient][:enabled]
+if defined?(::Sidekiq) && AppOpticsAPM::Config[:sidekiqclient][:enabled]
   ::Sidekiq.configure_client do |config|
     config.client_middleware do |chain|
       ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Adding Sidekiq client middleware' if AppOpticsAPM::Config[:verbose]

data/lib/appoptics_apm/inst/sidekiq-worker.rb

@@ -55,7 +55,7 @@ module AppOpticsAPM
   end
 end
 
-if defined?(::Sidekiq) && RUBY_VERSION >= '2.0' && AppOpticsAPM::Config[:sidekiqworker][:enabled]
+if defined?(::Sidekiq) && AppOpticsAPM::Config[:sidekiqworker][:enabled]
   ::AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting sidekiq' if AppOpticsAPM::Config[:verbose]
 
   ::Sidekiq.configure_server do |config|

data/lib/appoptics_apm/legacy_method_profiling.rb

@@ -29,20 +29,13 @@ module AppOpticsAPMMethodProfiling
     def profile_method_real(method_name, profile_name, store_args = false, store_return = false, *_)
       begin
         # this only gets file and line where profiling is turned on, presumably
-        # right after the function definition. ruby 1.9 and 2.0 has nice introspection (Method.source_location)
-        # but its appears no such luck for ruby 1.8
+        # right after the function definition.
         file = ''
         line = ''
-        if RUBY_VERSION >= '1.9'
-          info = instance_method(method_name).source_location
-          unless info.nil?
-            file = info[0].to_s
-            line = info[1].to_s
-          end
-        else
-          info = Kernel.caller[0].split(':')
-          file = info.first.to_s
-          line = info.last.to_s
+        info = instance_method(method_name).source_location
+        unless info.nil?
+          file = info[0].to_s
+          line = info[1].to_s
         end
 
         # Safety:  Make sure there are no quotes or double quotes to break the class_eval

data/lib/appoptics_apm/util.rb

@@ -105,9 +105,6 @@ module AppOpticsAPM
       #
       def static_asset?(path)
         path =~ Regexp.new(AppOpticsAPM::Config[:dnt_regexp], AppOpticsAPM::Config[:dnt_opts])
-      rescue => e
-        AppOpticsAPM.logger.warn "[AppOpticsAPM/debug] Could not apply Regex.new to path. #{e.inspect}"
-        false
       end
 
       ##
@@ -209,7 +206,7 @@ module AppOpticsAPM
           platform_info['Ruby.Excon.Version']      = "Excon-#{::Excon::VERSION}"           if defined?(::Excon::VERSION)
           platform_info['Ruby.Faraday.Version']    = "Faraday-#{::Faraday::VERSION}"       if defined?(::Faraday::VERSION)
           platform_info['Ruby.HTTPClient.Version'] = "HTTPClient-#{::HTTPClient::VERSION}" if defined?(::HTTPClient::VERSION)
-          platform_info['Ruby.MemCache.Version']   = "MemCache-#{::MemCache::VERSION}"     if defined?(::MemCache::VERSION)
+          platform_info['Ruby.Memcached.Version']  = "Memcached-#{::Memcached::VERSION}"   if defined?(::Memcached::VERSION)
           platform_info['Ruby.Moped.Version']      = "Moped-#{::Moped::VERSION}"           if defined?(::Moped::VERSION)
           platform_info['Ruby.Redis.Version']      = "Redis-#{::Redis::VERSION}"           if defined?(::Redis::VERSION)
           platform_info['Ruby.Resque.Version']     = "Resque-#{::Resque::VERSION}"         if defined?(::Resque::VERSION)

data/lib/appoptics_apm/version.rb

@@ -7,8 +7,8 @@ module AppOpticsAPM
   # appoptics_apm.gemspec during gem build process
   module Version
     MAJOR = 4
-    MINOR = 0
-    PATCH = 9
+    MINOR = 1
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/rails/generators/appoptics_apm/templates/appoptics_apm_initializer.rb

@@ -165,7 +165,6 @@ if defined?(AppOpticsAPM::Config)
   # AppOpticsAPM::Config[:faraday][:enabled] = true
   # AppOpticsAPM::Config[:grape][:enabled] = true
   # AppOpticsAPM::Config[:httpclient][:enabled] = true
-  # AppOpticsAPM::Config[:memcache][:enabled] = true
   # AppOpticsAPM::Config[:memcached][:enabled] = true
   # AppOpticsAPM::Config[:mongo][:enabled] = true
   # AppOpticsAPM::Config[:moped][:enabled] = true
@@ -204,7 +203,6 @@ if defined?(AppOpticsAPM::Config)
   # AppOpticsAPM::Config[:faraday][:collect_backtraces] = false
   # AppOpticsAPM::Config[:grape][:collect_backtraces] = false
   # AppOpticsAPM::Config[:httpclient][:collect_backtraces] = false
-  # AppOpticsAPM::Config[:memcache][:collect_backtraces] = false
   # AppOpticsAPM::Config[:memcached][:collect_backtraces] = false
   # AppOpticsAPM::Config[:mongo][:collect_backtraces] = true
   # AppOpticsAPM::Config[:moped][:collect_backtraces] = true

data/run_tests_docker.rb

@@ -31,7 +31,6 @@ travis['matrix']['exclude'].each do |h|
 end
 
 matrix.each do |args|
-  args['rvm'] = '1.9.3-p551' if args['rvm'] =~ /1.9.3/
   `docker-compose run --rm --service-ports ruby_appoptics_apm /code/ruby-appoptics_apm/ruby_setup.sh #{args['rvm']} #{args['gemfile']} #{args['env']}`
   puts "docker-compose run --rm --service-ports ruby_appoptics_apm /code/ruby-appoptics_apm/ruby_setup.sh #{args['rvm']} #{args['gemfile']} #{args['env']}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appoptics_apm
 version: !ruby/object:Gem::Version
-  version: 4.0.9
+  version: 4.1.0
 platform: ruby
 authors:
 - Maia Engeli
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-05 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -26,26 +26,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: no_proxy_fix
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +172,6 @@ files:
 - lib/appoptics_apm/inst/faraday.rb
 - lib/appoptics_apm/inst/http.rb
 - lib/appoptics_apm/inst/httpclient.rb
-- lib/appoptics_apm/inst/memcache.rb
 - lib/appoptics_apm/inst/memcached.rb
 - lib/appoptics_apm/inst/mongo.rb
 - lib/appoptics_apm/inst/mongo2.rb
@@ -242,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/appoptics_apm/inst/memcache.rb

@@ -1,102 +0,0 @@
-# Copyright (c) 2016 SolarWinds, LLC.
-# All rights reserved.
-
-module AppOpticsAPM
-  module Inst
-    module MemCache
-      include AppOpticsAPM::API::Memcache
-
-      def self.included(cls)
-        AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting memcache' if AppOpticsAPM::Config[:verbose]
-
-        cls.class_eval do
-          MEMCACHE_OPS.reject { |m| !method_defined?(m) }.each do |m|
-
-            define_method("#{m}_with_appoptics") do |*args|
-              report_kvs = { :KVOp => m }
-              report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:memcache][:collect_backtraces]
-
-              if AppOpticsAPM.tracing?
-                AppOpticsAPM::API.trace(:memcache, report_kvs) do
-                  send("#{m}_without_appoptics", *args)
-                end
-              else
-                send("#{m}_without_appoptics", *args)
-              end
-            end
-
-            class_eval "alias #{m}_without_appoptics #{m}"
-            class_eval "alias #{m} #{m}_with_appoptics"
-          end
-        end
-
-        [:request_setup, :cache_get, :get_multi].each do |m|
-          if ::MemCache.method_defined? :request_setup
-            cls.class_eval "alias #{m}_without_appoptics #{m}"
-            cls.class_eval "alias #{m} #{m}_with_appoptics"
-          elsif AppOpticsAPM::Config[:verbose]
-            AppOpticsAPM.logger.warn "[appoptics_apm/loading] Couldn't properly instrument Memcache: #{m}"
-          end
-        end
-      end
-
-      def get_multi_with_appoptics(*args)
-        return get_multi_without_appoptics(args) unless AppOpticsAPM.tracing?
-
-        info_kvs = {}
-
-        begin
-          info_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:memcache][:collect_backtraces]
-
-          if args.last.is_a?(Hash) || args.last.nil?
-            info_kvs[:KVKeyCount] = args.flatten.length - 1
-          else
-            info_kvs[:KVKeyCount] = args.flatten.length
-          end
-        rescue StandardError => e
-          AppOpticsAPM.logger.debug "[appoptics_apm/debug] Error collecting info keys: #{e.message}"
-          AppOpticsAPM.logger.debug e.backtrace
-        end
-
-        AppOpticsAPM::API.trace(:memcache, { :KVOp => :get_multi }, :get_multi) do
-          values = get_multi_without_appoptics(args)
-
-          info_kvs[:KVHitCount] = values.length
-          AppOpticsAPM::API.log(:memcache, :info, info_kvs)
-
-          values
-        end
-      end
-
-      def request_setup_with_appoptics(*args)
-        if AppOpticsAPM.tracing? && !AppOpticsAPM.tracing_layer_op?(:get_multi)
-          server, cache_key = request_setup_without_appoptics(*args)
-
-          info_kvs = { :KVKey => cache_key, :RemoteHost => server.host }
-          info_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:memcache][:collect_backtraces]
-          AppOpticsAPM::API.log(:memcache, :info, info_kvs)
-
-          [server, cache_key]
-        else
-          request_setup_without_appoptics(*args)
-        end
-      end
-
-      def cache_get_with_appoptics(server, cache_key)
-        result = cache_get_without_appoptics(server, cache_key)
-
-        info_kvs = { :KVHit => memcache_hit?(result) }
-        info_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:memcache][:collect_backtraces]
-        AppOpticsAPM::API.log(:memcache, :info, info_kvs)
-
-        result
-      end
-    end # module MemCache
-  end # module Inst
-end # module AppOpticsAPM
-
-if defined?(::MemCache) && AppOpticsAPM::Config[:memcache][:enabled]
-  ::MemCache.class_eval do
-    include AppOpticsAPM::Inst::MemCache
-  end
-end