appoptics_apm 4.4.0 → 4.4.1

data/lib/oboe/backward_compatibility.rb

@@ -11,7 +11,7 @@ module Oboe
   #
   module API
     include AppOpticsAPM::API
-    extend ::AppOpticsAPM::ThreadLocal
+    extend AppOpticsAPM::ThreadLocal
     thread_local :deprecation_notified
 
     def self.method_missing(sym, *args, &blk)
@@ -31,7 +31,7 @@ module Oboe
   # Support for Oboe::Config calls
   #
   module Config
-    extend ::AppOpticsAPM::ThreadLocal
+    extend AppOpticsAPM::ThreadLocal
     thread_local :deprecation_notified
 
     def self.method_missing(sym, *args)
@@ -50,7 +50,7 @@ module Oboe
   # Support for legacy Oboe::Ruby.load calls
   #
   module Ruby
-    extend ::AppOpticsAPM::ThreadLocal
+    extend AppOpticsAPM::ThreadLocal
     thread_local :deprecation_notified
 
     def self.method_missing(sym, *args)

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

@@ -31,7 +31,7 @@ if defined?(AppOpticsAPM::Config)
   #
   # It sets the log level and takes the following values:
   # -1 disabled, 0 fatal, 1 error, 2 warning, 3 info (the default), 4 debug low, 5 debug medium, 6 debug high.
-  # Values < -1 or > 6 will set the log level to the default (info).
+  # Values out of range (< -1 or > 6) are ignored and the log level is set to the default (info).
   #
   AppOpticsAPM::Config[:debug_level] = 3
   #
@@ -75,7 +75,7 @@ if defined?(AppOpticsAPM::Config)
   # collect and report query literals to AppOpticsAPM.
   #
   AppOpticsAPM::Config[:sanitize_sql] = true
-  AppOpticsAPM::Config[:sanitize_sql_regexp] = '(\'[\s\S][^\']*\'|\d*\.\d+|\d+|NULL)'
+  AppOpticsAPM::Config[:sanitize_sql_regexp] = '(\'[^\']*\'|\d*\.\d+|\d+|NULL)'
   AppOpticsAPM::Config[:sanitize_sql_opts]   = Regexp::IGNORECASE
 
   #
@@ -183,6 +183,7 @@ if defined?(AppOpticsAPM::Config)
   AppOpticsAPM::Config[:mongo][:enabled] = true
   AppOpticsAPM::Config[:moped][:enabled] = true
   AppOpticsAPM::Config[:nethttp][:enabled] = true
+  AppOpticsAPM::Config[:padrino][:enabled] = true
   AppOpticsAPM::Config[:rack][:enabled] = true
   AppOpticsAPM::Config[:redis][:enabled] = true
   AppOpticsAPM::Config[:resqueclient][:enabled] = true
@@ -191,14 +192,18 @@ if defined?(AppOpticsAPM::Config)
   AppOpticsAPM::Config[:sequel][:enabled] = true
   AppOpticsAPM::Config[:sidekiqclient][:enabled] = true
   AppOpticsAPM::Config[:sidekiqworker][:enabled] = true
+  AppOpticsAPM::Config[:sinatra][:enabled] = true
   AppOpticsAPM::Config[:typhoeus][:enabled] = true
   #
 
   #
   # Argument logging
   #
-  # for http requests
-  # Set to true to enable argument logging
+  #
+  # For http requests:
+  # By default the query string parameters are included in the URLs reported.
+  # Set :log_args to false and instrumentation will stop collecting
+  # and reporting query arguments from URLs.
   #
   AppOpticsAPM::Config[:bunnyconsumer][:log_args] = true
   AppOpticsAPM::Config[:curb][:log_args] = true
@@ -243,6 +248,7 @@ if defined?(AppOpticsAPM::Config)
   AppOpticsAPM::Config[:mongo][:collect_backtraces] = true
   AppOpticsAPM::Config[:moped][:collect_backtraces] = true
   AppOpticsAPM::Config[:nethttp][:collect_backtraces] = true
+  AppOpticsAPM::Config[:padrino][:collect_backtraces] = true
   AppOpticsAPM::Config[:rack][:collect_backtraces] = true
   AppOpticsAPM::Config[:redis][:collect_backtraces] = false
   AppOpticsAPM::Config[:resqueclient][:collect_backtraces] = true
@@ -251,6 +257,7 @@ if defined?(AppOpticsAPM::Config)
   AppOpticsAPM::Config[:sequel][:collect_backtraces] = true
   AppOpticsAPM::Config[:sidekiqclient][:collect_backtraces] = false
   AppOpticsAPM::Config[:sidekiqworker][:collect_backtraces] = false
+  AppOpticsAPM::Config[:sinatra][:collect_backtraces] = true
   AppOpticsAPM::Config[:typhoeus][:collect_backtraces] = false
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appoptics_apm
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Maia Engeli
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -169,7 +169,6 @@ files:
 - lib/appoptics_apm/config.rb
 - lib/appoptics_apm/frameworks/grape.rb
 - lib/appoptics_apm/frameworks/padrino.rb
-- lib/appoptics_apm/frameworks/padrino/templates.rb
 - lib/appoptics_apm/frameworks/rails.rb
 - lib/appoptics_apm/frameworks/rails/inst/action_controller.rb
 - lib/appoptics_apm/frameworks/rails/inst/action_controller3.rb
@@ -185,7 +184,6 @@ files:
 - lib/appoptics_apm/frameworks/rails/inst/connection_adapters/utils.rb
 - lib/appoptics_apm/frameworks/rails/inst/connection_adapters/utils5x.rb
 - lib/appoptics_apm/frameworks/sinatra.rb
-- lib/appoptics_apm/frameworks/sinatra/templates.rb
 - lib/appoptics_apm/inst/bunny-client.rb
 - lib/appoptics_apm/inst/bunny-consumer.rb
 - lib/appoptics_apm/inst/curb.rb

data/lib/appoptics_apm/frameworks/padrino/templates.rb

@@ -1,58 +0,0 @@
-# Copyright (c) 2016 SolarWinds, LLC.
-# All rights reserved.
-
-module AppOpticsAPM
-  module PadrinoInst
-    module Rendering
-      def self.included(klass)
-        ::AppOpticsAPM::Util.method_alias(klass, :render, ::Padrino::Rendering)
-      end
-
-      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)
-
-            begin
-              render_without_appoptics(engine, data, options, locals, &block)
-            ensure
-              ::AppOpticsAPM::API.log_exit(:render, report_kvs)
-            end
-          end
-        else
-          render_without_appoptics(engine, data, options, locals, &block)
-        end
-      end
-    end
-  end
-end

data/lib/appoptics_apm/frameworks/sinatra/templates.rb

@@ -1,56 +0,0 @@
-# Copyright (c) 2016 SolarWinds, LLC.
-# All rights reserved.
-
-module AppOpticsAPM
-  module Sinatra
-    module Templates
-      def self.included(klass)
-        ::AppOpticsAPM::Util.method_alias(klass, :render, ::Sinatra::Templates)
-      end
-
-      def render_with_appoptics(engine, data, options = {}, locals = {}, &block)
-        if AppOpticsAPM.tracing?
-          report_kvs = {}
-
-          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
-              ::AppOpticsAPM::API.log_exit(:render, report_kvs, :render)
-            end
-          end
-        else
-          render_without_appoptics(engine, data, options, locals, &block)
-        end
-      end
-    end
-  end
-end