appoptics_apm 4.9.0 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4b87b6581745b8485f7ddb38f17cb6eab85244a950e7d67cecfe0e97cdbd0bc
-  data.tar.gz: dce765afa7ceb92b523c448cd9b1b10efc1b6c5bb0f2f92842dc6af3c1934b27
+  metadata.gz: df0f7977cb5f0fdf91217b32c632c0349fd66eedca4e3aec3a744c5a93db5fa3
+  data.tar.gz: b85f35a591b5ce51050cdbbc5a59e1ca8dd3aa92f62578419aaca710fa3e23f7
 SHA512:
-  metadata.gz: d9b446519730872b09136e9b80e546a68dce40abf52fbb0e5ac139244c6ed3c7fa8ef45eb855714d8e11924886d0b972aa04332cec6342339c65772f5b7aec0f
-  data.tar.gz: 80df368e2ed2c868348ba5e7e9b24dfa2498d6f0cb703d568fbf8310879d06fee5ac59187a70747f04c040d4d54df2b8925faa856dc5a01b036375f21edacfbe
+  metadata.gz: 347da55c1ec4b00c842b217171a256dc97a04f4c8a9cf57f64cc2a595e2809dc0cacaa7e7e52a7a2635bf203f1706c8e86bc83a54071887a868f5362cfdf86c8
+  data.tar.gz: 80466d964db1077a415c8d4ca39f63b0cf3af8bdd68f1b1c564389d74bc156c60386dca008e85ba7afecdf4b3650aa5c519ab974b0c25b81a23559ee058aad8b

data/.gitignore

@@ -27,7 +27,6 @@ coverage
 doc
 .*byebug*
 gemfiles/vendor*
-scrap.rb
-scarp_gemfile
+scrap*
 .irbrc
 *.code-workspace

data/.travis.yml

@@ -14,7 +14,8 @@ rvm:
   - 2.6.4
   - 2.5.5
   - 2.4.5
-  - ruby-head
+  - 2.7.0-preview1
+#  - ruby-head
 #  - jruby-9.0.5.0
 
 gemfile:
@@ -33,19 +34,23 @@ matrix:
   exclude:
     - rvm: ruby-head
       gemfile: gemfiles/rails42.gemfile
+    - rvm: 2.7.0-preview1
+      gemfile: gemfiles/rails42.gemfile
     - rvm: 2.6.4
       gemfile: gemfiles/rails42.gemfile
     - rvm: 2.4.5
       gemfile: gemfiles/rails60.gemfile
 
+    - rvm: ruby-head
+      env: DBTYPE=mysql
+    - rvm: 2.7.0-preview1
+      env: DBTYPE=mysql
     - rmv: 2.6.4
       env: DBTYPE=mysql
     - rvm: 2.5.5
       env: DBTYPE=mysql
     - rvm: 2.4.5
       env: DBTYPE=mysql
-    - rvm: ruby-head
-      env: DBTYPE=mysql
 
     - gemfile: gemfiles/unit.gemfile
       env: DBTYPE=mysql
@@ -82,6 +87,7 @@ matrix:
       env: DBTYPE=mysql2
   allow_failures:
     - rvm: ruby-head
+    - rvm: 2.7.0-preview1
 
 # FIXME: Figure out if this is still an issue when reviewing cassandra test setup
 # Attempt Travis/Cassandra fix re: https://github.com/travis-ci/travis-ci/issues/1484
@@ -111,6 +117,7 @@ before_script:
   - export APPOPTICS_REPORTER_FILE_SINGLE=false
   - export APPOPTICS_TOKEN_BUCKET_CAPACITY=1000
   - export APPOPTICS_TOKEN_BUCKET_RATE=1000
+  - export APPOPTICS_FROM_S3=true
 
   - bundle update --jobs=3 --retry=3
   - bundle exec rake clean fetch compile
@@ -119,7 +126,7 @@ before_script:
   - redis-server --requirepass secret_pass &
   - sleep 10
 
-script: "N=1 bundle exec rake test"
+script: "bundle exec rake test"
 
 services:
   - mongodb

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
+gem 'rake'
 
 group :development, :test do
-  gem 'rake'
   gem 'minitest'
   gem 'minitest-reporters', '< 1.0.18'
   gem 'minitest-debugger', :require => false
@@ -18,12 +18,12 @@ group :development, :test do
   gem 'byebug'
   gem 'get_process_mem'
   gem 'memory_profiler'
-end
 
-if defined?(JRUBY_VERSION)
-  gem 'sinatra', :require => false
-else
-  gem 'sinatra'
+  if defined?(JRUBY_VERSION)
+    gem 'sinatra', :require => false
+  else
+    gem 'sinatra'
+  end
 end
 
 gemspec

data/appoptics_apm.gemspec

@@ -32,6 +32,9 @@ Automatic tracing and metrics for Ruby applications. Get started at appoptics.co
               'ext/oboe_metal/src/bson/bson.h',
               'ext/oboe_metal/src/bson/platform_hacks.h',
               'ext/oboe_metal/src/VERSION']
+  s.files -= ['build_gem.sh',
+              'build_gem_upload_to_packagecloud.sh',
+              'Rakefile']
 
   # TODO this is commented out util we can actually provide gems for different platforms
   # it will create a gem that goes into noop on Darwin and other unsupported platforms

data/ext/oboe_metal/noop/noop.c

@@ -3,5 +3,6 @@
 /* ruby calls this to load the extension */
 void Init_oboe_noop(void) {
   /* assume we haven't yet defined Hola */
-  VALUE klass = rb_define_class("OboeNoop", rb_cObject);
+//  VALUE klass = rb_define_class("OboeNoop", rb_cObject);
+  rb_define_class("OboeNoop", rb_cObject);
 }

data/ext/oboe_metal/src/VERSION

@@ -1 +1 @@
-6.0.0
+7.0.0

data/lib/appoptics_apm.rb

@@ -43,8 +43,6 @@ begin
 
   # appoptics_apm/loading can set AppOpticsAPM.loaded = false if the service key is not working
   require 'appoptics_apm/loading'
-  require 'appoptics_apm/legacy_method_profiling'
-  require 'appoptics_apm/method_profiling'
 
   if AppOpticsAPM.loaded
     require 'appoptics_apm/instrumentation'
@@ -69,7 +67,6 @@ begin
   # Load Ruby module last.  If there is no framework detected,
   # it will load all of the Ruby instrumentation
   require 'appoptics_apm/ruby'
-  require 'oboe/backward_compatibility'
 
   require 'appoptics_apm/test' if ENV['APPOPTICS_GEM_TEST']
 rescue => e

data/lib/appoptics_apm/api.rb

@@ -6,7 +6,6 @@ module AppOpticsAPM
   module API
     extend AppOpticsAPM::API::Logging
     extend AppOpticsAPM::API::Metrics
-    extend AppOpticsAPM::API::Profiling
     extend AppOpticsAPM::API::LayerInit
     extend AppOpticsAPM::API::Util
 

data/lib/appoptics_apm/api/tracing.rb

@@ -48,6 +48,10 @@ module AppOpticsAPM
         [start_trace_with_target(span, xtrace, target, opts) { yield }, target['X-Trace']]
       end
 
+      def profile_method(*args)
+        AppOpticsAPM.logger.warn("DEPRECATED: AppOpticsAPM::API.profile_method is deprecated. Use: AppOpticsAPM::SDK::trace_method")
+        AppOpticsAPM::SDK.trace_method(*args)
+      end
     end
   end
 end

data/lib/appoptics_apm/config.rb

@@ -16,12 +16,16 @@ module AppOpticsAPM
     @@instrumentation = [:action_controller, :action_controller_api, :action_view,
                          :active_record, :bunnyclient, :bunnyconsumer, :cassandra, :curb,
                          :dalli, :delayed_jobclient, :delayed_jobworker,
-                         # :em_http_request,
                          :excon, :faraday, :grpc_client, :grpc_server, :grape,
                          :httpclient, :nethttp, :memcached, :mongo, :moped, :padrino, :rack, :redis,
                          :resqueclient, :resqueworker, :rest_client,
                          :sequel, :sidekiqclient, :sidekiqworker, :sinatra, :typhoeus]
 
+    # ignore configs for instrumentations we don't have anymore
+    # can't remove because the config may still be present in configs created
+    # with previous gem versions
+    @@ignore = [:em_http_request]
+
     # Subgrouping of instrumentation
     @@http_clients = [:curb, :excon,
                       # :em_http_request,
@@ -139,7 +143,7 @@ module AppOpticsAPM
     #
     # rubocop:disable Metrics/AbcSize
     def self.initialize(_data = {})
-      @@instrumentation.each { |k| @@config[k] = {} }
+      (@@instrumentation+@@ignore).each { |k| @@config[k] = {} }
       @@config[:transaction_name] = {}
 
       # Always load the template, it has all the keys and defaults defined,

data/lib/appoptics_apm/frameworks/padrino.rb

@@ -38,47 +38,17 @@ module AppOpticsAPM
       end
 
       # TODO add test coverage, currently there are no tests for this
+      # ____ I'm not sure this gets ever called, Padrino uses Sinatra's render method
       def render_with_appoptics(engine, data = nil, options = {}, locals = {}, &block)
         if AppOpticsAPM.tracing?
           report_kvs = {}
 
-          if data
-            report_kvs[:engine] = engine
-            report_kvs[:template] = data
-          else
-            report_kvs[:template] = engine
-          end
-
-          if AppOpticsAPM.tracing_layer_op?(:render)
-            # For recursive calls to :render (for sub-partials and layouts),
-            # use method profiling.
-            begin
-              report_kvs[:FunctionName] = :render
-              report_kvs[:Class]        = :Rendering
-              report_kvs[:Module]       = :Padrino
-              report_kvs[:File]         = __FILE__
-              report_kvs[:LineNumber]   = __LINE__
-            rescue StandardError => e
-              AppOpticsAPM.logger.debug "[appoptics_apm/padrino] #{e.message}"
-              AppOpticsAPM.logger.debug e.backtrace.join(', ')
-            end
-
-            AppOpticsAPM::API.profile(report_kvs[:template], report_kvs, false) do
-              render_without_appoptics(engine, data, options, locals, &block)
-            end
-          else
-            # Fall back to the raw tracing API so we can pass KVs
-            # back on exit (a limitation of the AppOpticsAPM::API.trace
-            # block method) This removes the need for an info
-            # event to send additonal KVs
-            AppOpticsAPM::API.log_entry(:render, {}, :render)
+          report_kvs[:engine] = engine
+          report_kvs[:template] = data
 
-            begin
-              render_without_appoptics(engine, data, options, locals, &block)
-            ensure
-              report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:padrino][:collect_backtraces]
-              AppOpticsAPM::API.log_exit(:render, report_kvs)
-            end
+          AppOpticsAPM::SDK.trace(:padrino_render, report_kvs, :padrino_render) do
+            report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:padrino][:collect_backtraces]
+            render_without_appoptics(engine, data, options, locals, &block)
           end
         else
           render_without_appoptics(engine, data, options, locals, &block)

data/lib/appoptics_apm/frameworks/rails.rb

@@ -48,7 +48,6 @@ module AppOpticsAPM
       # Load the Rails specific instrumentation
       require 'appoptics_apm/frameworks/rails/inst/action_controller'
       require 'appoptics_apm/frameworks/rails/inst/action_view'
-      require 'appoptics_apm/frameworks/rails/inst/action_view_30'
       require 'appoptics_apm/frameworks/rails/inst/active_record'
       require 'appoptics_apm/frameworks/rails/inst/logger_formatters'
 

data/lib/appoptics_apm/frameworks/rails/inst/action_controller.rb

@@ -35,7 +35,7 @@ module AppOpticsAPM
       #
       # log_rails_error?
       #
-      # Determins whether we should log a raised exception to the
+      # Determines whether we should log a raised exception to the
       # AppOptics dashboard.  This is determined by whether the exception
       # has a rescue handler setup and the value of
       # AppOpticsAPM::Config[:report_rescued_errors]

data/lib/appoptics_apm/frameworks/rails/inst/action_view.rb

@@ -1,53 +1,40 @@
 # Copyright (c) 2016 SolarWinds, LLC.
 # All rights reserved.
 
-if defined?(ActionView::Base) && AppOpticsAPM::Config[:action_view][:enabled]  && Rails::VERSION::MAJOR < 6
+if defined?(ActionView::Base) && AppOpticsAPM::Config[:action_view][:enabled]
 
-  ##
-  # ActionView Instrumentation is version dependent.  ActionView 2.x is separate
-  # and ActionView 3.0 is a special case.
-  # Everything else goes here. (ActionView 3.1 - 4.0 as of this writing)
-  #
-  if (Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR > 0) || Rails::VERSION::MAJOR >= 4
+  if Rails::VERSION::MAJOR >= 4
 
     AppOpticsAPM.logger.info '[appoptics_apm/loading] Instrumenting actionview' if AppOpticsAPM::Config[:verbose]
 
     ActionView::PartialRenderer.class_eval do
       alias :render_partial_without_appoptics :render_partial
-      def render_partial
+      def render_partial(*args)
         entry_kvs = {}
         begin
-          name = AppOpticsAPM::Util.prettify(@options[:partial]) if @options.is_a?(Hash)
-          entry_kvs[:FunctionName] = :render_partial
-          entry_kvs[:Class]        = :PartialRenderer
-          entry_kvs[:Module]       = :ActionView
-          entry_kvs[:File]         = __FILE__
-          entry_kvs[:LineNumber]   = __LINE__
+          entry_kvs[:Partial] = AppOpticsAPM::Util.prettify(@options[:partial]) if @options.is_a?(Hash)
         rescue => e
           AppOpticsAPM.logger.debug "[appoptics_apm/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if AppOpticsAPM::Config[:verbose]
         end
 
-        AppOpticsAPM::API.profile(name, entry_kvs, AppOpticsAPM::Config[:action_view][:collect_backtraces]) do
-          render_partial_without_appoptics
+        AppOpticsAPM::SDK.trace('partial', entry_kvs) do
+          entry_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:action_view][:collect_backtraces]
+          render_partial_without_appoptics(*args)
         end
       end
 
       alias :render_collection_without_appoptics :render_collection
-      def render_collection
+      def render_collection(*args)
         entry_kvs = {}
         begin
-          name = AppOpticsAPM::Util.prettify(@path)
-          entry_kvs[:FunctionName] = :render_collection
-          entry_kvs[:Class]        = :PartialRenderer
-          entry_kvs[:Module]       = :ActionView
-          entry_kvs[:File]         = __FILE__
-          entry_kvs[:LineNumber]   = __LINE__
+          entry_kvs[:Partial] = AppOpticsAPM::Util.prettify(@path)
         rescue => e
           AppOpticsAPM.logger.debug "[appoptics_apm/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if AppOpticsAPM::Config[:verbose]
         end
 
-        AppOpticsAPM::API.profile(name, entry_kvs, AppOpticsAPM::Config[:action_view][:collect_backtraces]) do
-          render_collection_without_appoptics
+        AppOpticsAPM::SDK.trace('collection', entry_kvs) do
+          entry_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:action_view][:collect_backtraces]
+          render_collection_without_appoptics(*args)
         end
       end
 

data/lib/appoptics_apm/frameworks/rails/inst/active_record.rb

@@ -17,7 +17,7 @@ if AppOpticsAPM::Config[:active_record][:enabled] && !defined?(JRUBY_VERSION) &&
 
     AppOpticsAPM::Inst::ConnectionAdapters::FlavorInitializers.mysql      if adapter == 'mysql'
     AppOpticsAPM::Inst::ConnectionAdapters::FlavorInitializers.mysql2     if adapter == 'mysql2'
-    AppOpticsAPM::Inst::ConnectionAdapters::FlavorInitializers.postgresql if adapter == 'postgresql'
+    AppOpticsAPM::Inst::ConnectionAdapters::FlavorInitializers.postgresql if adapter =~ /postgresql|postgis/i
 
   rescue StandardError => e
     AppOpticsAPM.logger.error "[appoptics_apm/error] AppOpticsAPM/ActiveRecord error: #{e.inspect}"

data/lib/appoptics_apm/frameworks/rails/inst/connection_adapters/utils.rb

@@ -29,7 +29,7 @@ module AppOpticsAPM
             case adapter_name
             when /mysql/i
               opts[:Flavor] = 'mysql'
-            when /postgres/i
+            when /^postgres|^postgis/i
               opts[:Flavor] = 'postgresql'
             end
           end

data/lib/appoptics_apm/frameworks/rails/inst/connection_adapters/utils5x.rb

@@ -35,7 +35,7 @@ module AppOpticsAPM
               case adapter_name
               when /mysql/i
                 opts[:Flavor] = 'mysql'
-              when /postgres/i
+              when /^postgres|^postgis/i
                 opts[:Flavor] = 'postgresql'
               end
             end

data/lib/appoptics_apm/frameworks/sinatra.rb

@@ -61,38 +61,9 @@ module AppOpticsAPM
           report_kvs[:engine] = engine
           report_kvs[:template] = data
 
-          if AppOpticsAPM.tracing_layer_op?(:render)
-            # For recursive calls to :render (for sub-partials and layouts),
-            # use method profiling.
-            begin
-              name = data
-              report_kvs[:FunctionName] = :render
-              report_kvs[:Class]        = :Templates
-              report_kvs[:Module]       = :'Sinatra::Templates'
-              report_kvs[:File]         = __FILE__
-              report_kvs[:LineNumber]   = __LINE__
-            rescue StandardError => e
-              AppOpticsAPM.logger.debug e.message
-              AppOpticsAPM.logger.debug e.backtrace.join(', ')
-            end
-
-            AppOpticsAPM::API.profile(name, report_kvs, false) do
-              render_without_appoptics(engine, data, options, locals, &block)
-            end
-
-          else
-            # Fall back to the raw tracing API so we can pass KVs
-            # back on exit (a limitation of the AppOpticsAPM::API.trace
-            # block method) This removes the need for an info
-            # event to send additonal KVs
-            AppOpticsAPM::API.log_entry(:render, {}, :render)
-
-            begin
-              render_without_appoptics(engine, data, options, locals, &block)
-            ensure
-              report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:sinatra][:collect_backtraces]
-              AppOpticsAPM::API.log_exit(:render, report_kvs, :render)
-            end
+          AppOpticsAPM::SDK.trace(:sinatra_render, report_kvs, :sinatra_render) do
+            report_kvs[:Backtrace] = AppOpticsAPM::API.backtrace if AppOpticsAPM::Config[:sinatra][:collect_backtraces]
+            render_without_appoptics(engine, data, options, locals, &block)
           end
         else
           render_without_appoptics(engine, data, options, locals, &block)

data/lib/appoptics_apm/inst/curb.rb

@@ -46,12 +46,12 @@ module AppOpticsAPM
       end
       
       ##
-      # profile_curb_method
+      # trace_curb_method
       #
       # An agnostic method that will profile any Curl::Easy method (and optional args and block)
       # that you throw at it.
       #
-      def profile_curb_method(kvs, method, args, &block)
+      def trace_curb_method(kvs, method, args, &block)
         # If we're not tracing, just do a fast return.
         unless AppOpticsAPM.tracing?
           unless AppOpticsAPM::API.blacklisted?(URI(url).hostname)
@@ -129,7 +129,7 @@ module AppOpticsAPM
         kvs = {}
         kvs[:HTTPMethod] = :POST
 
-        profile_curb_method(kvs, :http_post_without_appoptics, args, &block)
+        trace_curb_method(kvs, :http_post_without_appoptics, args, &block)
       end
 
       ##
@@ -149,7 +149,7 @@ module AppOpticsAPM
         kvs = {}
         kvs[:HTTPMethod] = :PUT
 
-        profile_curb_method(kvs, :http_put_without_appoptics, args, &block)
+        trace_curb_method(kvs, :http_put_without_appoptics, args, &block)
       end
 
       ##
@@ -178,7 +178,7 @@ module AppOpticsAPM
           kvs[:HTTPMethod] = :GET
         end
 
-        profile_curb_method(kvs, :perform_without_appoptics, nil, &block)
+        trace_curb_method(kvs, :perform_without_appoptics, nil, &block)
       end
 
       ##
@@ -198,7 +198,7 @@ module AppOpticsAPM
         kvs = {}
         kvs[:HTTPMethod] = verb
 
-        profile_curb_method(kvs, :http_without_appoptics, [verb], &block)
+        trace_curb_method(kvs, :http_without_appoptics, [verb], &block)
       end
     end