appoptics_apm 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90ed895e7d5acf3fb30fa85e0d5df0a3df0d3075
-  data.tar.gz: acf370948b698d06dfe982a322058d2bb2e227eb
+  metadata.gz: bec85d45871f627c9a17c7d4ee6e592d33b1df21
+  data.tar.gz: c3bfd02109828928249837b492672ec0f7f5a0e8
 SHA512:
-  metadata.gz: 26c3753688ed6e8568b9c4ced5364505bde26cccfbf0b7ce53adb55ea5dd703de3427c7b68f96fe9845726d04c3049422c30feb686bd76791e5590467c70ca87
-  data.tar.gz: 8cdc020d21282e659a2fc8c82066f9975641f45a82735fc628e94e11dbf6cfc5ca0b35115e3ef3012be37daa32e05de733799d0d88f4470c03a925faeda62c00
+  metadata.gz: 847a79988f646a46381ee1ca6d581e500a8aa5e156569143aee9e846ef63b2dd0ec7a9686d8dce16e6f843185d758e1a87f88fe07d003546be2147a90f6d6bab
+  data.tar.gz: 5969da7af7a351e23d569ca2e02338164029227a97d73885ab0e0d042ae3f029c8b18d2f5d4c20c4089fe7881c2092756f08069272237eed6be54acb6443a5f1

data/Dockerfile_alpine

@@ -32,11 +32,10 @@ RUN  git clone https://github.com/rbenv/rbenv.git ~/.rbenv \
    && echo 'bundler' > ~/.rbenv/default-gems
 
 # install rubies to build our gem against
-RUN source  ~/.profile
-   && rbenv install 1.9.3-p551 \
+RUN source  ~/.profile \
    && rbenv install 2.3.1 \
-   && rbenv install 2.4.1
-   && rbenv install jruby-9.0.5.0
+   && rbenv install 2.4.1 \
+   # && rbenv install jruby-9.0.5.0
 
 # install swig 3.0.8
 RUN curl -SL http://kent.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz \
@@ -50,7 +49,7 @@ RUN apk add --upgrade \
       redis \
       memcached \
       postgresql \
-      openrc
+      openrc \
    && rc-service postgresql start \
    && echo "psql --command \"CREATE USER docker WITH SUPERUSER PASSWORD 'docker';\"" >> /tmp/config \
    && echo "createdb -O docker travis_ci_test" >> /tmp/config \

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'] || 'latest'
+  oboe_version = ENV['OBOE_VERSION'] || '2.0.10' # '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')
 
@@ -85,7 +85,7 @@ task :fetch_ext_deps do
     puts "fetching #{remote_file} to #{local_file}"
     open(remote_file, 'rb') do |rf|
       content = rf.read
-      File.open(local_file, 'wb') {|f| f.puts content}
+      File.open(local_file, 'wb') { |f| f.puts content }
     end
   end
   FileUtils.cd(ext_src_dir) do
@@ -105,7 +105,7 @@ task :compile do
     so_file  = File.expand_path('ext/oboe_metal/oboe_metal.so')
 
     Dir.chdir ext_dir
-    ENV['FROM_S3'] = 'TRUE'
+    ENV['APPOPTICS_FROM_S3'] = 'true'
     cmd = [Gem.ruby, 'extconf.rb']
     sh cmd.join(' ')
     sh '/usr/bin/env make'

data/appoptics_apm.gemspec

@@ -29,6 +29,7 @@ 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')
@@ -42,4 +43,5 @@ Gem::Specification.new do |s|
   end
 
   s.required_ruby_version = '>= 2.0.0'
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
 end

data/bin/appoptics_apm_config

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+##
+# execute this with `bundle exec appoptics_apm_config`
+# copies the configuration template file into the current  directory
+#
+
+puts "Copying the configuration template file to appoptics_apm_config_tmp.rb"
+puts "Edit and save as appoptics_apm_config.rb"
+
+target_file = File.join(Dir.pwd, 'appoptics_apm_config_tmp.rb')
+temp_orig = File.join(File.dirname(File.dirname(__FILE__)),
+                 'lib/rails/generators/appoptics_apm/templates/appoptics_apm_initializer.rb')
+
+FileUtils.copy(temp_orig, target_file)

data/docker-compose.yml

@@ -7,7 +7,7 @@ version: "2"
 # ('ruby_appoptics' and 'wait' will exit)
 #
 # to run some ruby tests:
-# > docker-compose run --service-ports ruby_appoptics /code/ruby-appoptics_apm/ruby_setup.sh 2.3.1 gemfiles/rails42.gemfile
+# > docker-compose run --service-ports ruby_appoptics_apm /code/ruby-appoptics_apm/ruby_setup.sh 2.3.6 gemfiles/rails42.gemfile
 #
 ########################################################################################################
 
@@ -34,27 +34,27 @@ services:
        - MYSQL_HOST=mysql
        - APPOPTICS_MONGO_SERVER=mongo
 
-  ruby_appoptics_apm_alpine:
-     container_name: ruby_appoptics_apm_alpine
-     image: ruby_alpine
-     build:
-        context: .
-        dockerfile: ./Dockerfile_alpine
-     cpu_quota: 100000 # 1 cpu, assumes cpu_period of 1 second
-     mem_limit: 1G
-     volumes:
-       - .:/code/ruby-appoptics_apm
-     depends_on:
-       - wait
-     links:
-       - wait
-     environment:
-       - APPOPTICS_RABBITMQ_SERVER=rabbitmq
-       - DOCKER_MYSQL_PASS=admin
-       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
-       - MYSQL_ROOT_PASSWORD=admin
-       - MYSQL_HOST=mysql
-       - APPOPTICS_MONGO_SERVER=mongo
+#  ruby_appoptics_apm_alpine:
+#     container_name: ruby_appoptics_apm_alpine
+#     image: ruby_alpine
+#     build:
+#        context: .
+#        dockerfile: ./Dockerfile_alpine
+#     cpu_quota: 100000 # 1 cpu, assumes cpu_period of 1 second
+#     mem_limit: 1G
+#     volumes:
+#       - .:/code/ruby-appoptics_apm
+#     depends_on:
+#       - wait
+#     links:
+#       - wait
+#     environment:
+#       - APPOPTICS_RABBITMQ_SERVER=rabbitmq
+#       - DOCKER_MYSQL_PASS=admin
+#       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+#       - MYSQL_ROOT_PASSWORD=admin
+#       - MYSQL_HOST=mysql
+#       - APPOPTICS_MONGO_SERVER=mongo
 
   rabbitmq:
     container_name: rabbitmq

data/ext/oboe_metal/extconf.rb

@@ -4,7 +4,7 @@
 require 'mkmf'
 require 'rbconfig'
 require 'open-uri'
-require 'digest'
+require 'no_proxy_fix'
 
 ext_dir = File.expand_path(File.dirname(__FILE__))
 
@@ -18,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['FROM_S3']
+if ENV['APPOPTICS_FROM_S3'].to_s.downcase == 'true'
   ao_path = File.join('https://s3-us-west-2.amazonaws.com/rc-files-t2/c-lib/', version)
   puts "Fetching c-lib from S3"
 else
@@ -78,6 +78,7 @@ 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

@@ -1 +1 @@
-2.0.9
+2.0.10

data/lib/appoptics_apm.rb

@@ -46,6 +46,8 @@ begin
   end
 
   require 'appoptics_apm/config'
+  AppOpticsAPM::Config.load_config_file
+
   require 'appoptics_apm/loading'
   require 'appoptics_apm/legacy_method_profiling'
   require 'appoptics_apm/method_profiling'
@@ -69,4 +71,4 @@ begin
 rescue => e
   $stderr.puts "[appoptics_apm/error] Problem loading: #{e.inspect}"
   $stderr.puts e.backtrace
-end
+end

data/lib/appoptics_apm/config.rb

@@ -23,156 +23,97 @@ module AppOpticsAPM
     @@http_clients = [:curb, :excon, :em_http_request, :faraday, :httpclient, :nethttp, :rest_client, :typhoeus]
 
     ##
-    # Return the raw nested hash.
+    # load_config_file
     #
-    def self.show
-      @@config
+    # There are 3 possible locations for the config file:
+    # Rails default, ENV['APPOPTICS_APM_CONFIG_RUBY'], or the gem's default
+    #
+    # Hierarchie:
+    # 1 - Rails default: config/initializers/appoptics_apm.rb
+    #     (also loaded  by Rails, but we can't reliably determine if Rails is running)
+    # 2 - ENV['APPOPTICS_APM_CONFIG_RUBY']
+    # 3 - Gem default: <startup_dir>/appoptics_apm_config.rb
+    #
+    def self.load_config_file
+      config_files = []
+
+      # Check for the rails config file
+      config_file = File.join(Dir.pwd, 'config/initializers/appoptics_apm.rb')
+      config_files << config_file if File.exist?(config_file)
+
+      # Check for file set by env variable
+      if ENV.key?('APPOPTICS_APM_CONFIG_RUBY')
+        if File.exist?(ENV['APPOPTICS_APM_CONFIG_RUBY']) && !File.directory?(ENV['APPOPTICS_APM_CONFIG_RUBY'])
+          config_files << ENV['APPOPTICS_APM_CONFIG_RUBY']
+        elsif File.exist?(File.join(ENV['APPOPTICS_APM_CONFIG_RUBY'], 'appoptics_apm_config.rb'))
+          config_files << File.join(ENV['APPOPTICS_APM_CONFIG_RUBY'], 'appoptics_apm_config.rb')
+        else
+          $stderr.puts 'Could not find the configuration file set by the APPOPTICS_APM_CONFIG_RUBY environment variable:'
+          $stderr.puts "#{ENV['APPOPTICS_APM_CONFIG_RUBY']}"
+        end
+      end
+
+      # Check for default config file
+      config_file = File.join(Dir.pwd, 'appoptics_apm_config.rb')
+      config_files << config_file if File.exist?(config_file)
+
+      return if config_files.empty?
+
+      if config_files.size > 1
+        $stderr.puts 'Found multiple configuration files, using the first one listed:'
+        config_files.each { |path| $stderr.puts "  #{path}" }
+      end
+      load(config_files[0])
+    end
+
+    ##
+    # print_config
+    #
+    # print configurations one per line
+    # to create an output similar to the content of the config file
+    #
+    def self.print_config
+      puts "# General configurations"
+      non_instrumentation = @@config.keys - @@instrumentation
+      non_instrumentation.each do |config|
+        puts "AppOpticsAPM::Config[:#{config}] = #{@@config[config]}"
+      end
+
+      puts "\n# Instrumentation specific configurations"
+      puts "# Enabled/Disabled Instrumentation"
+      @@instrumentation.each do |config|
+        puts "AppOpticsAPM::Config[:#{config}][:enabled] = #{@@config[config][:enabled]}"
+      end
+
+      puts "\n# Enabled/Disabled Backtrace Collection"
+      @@instrumentation.each do |config|
+        puts "AppOpticsAPM::Config[:#{config}][:collect_backtraces] = #{@@config[config][:collect_backtraces]}"
+      end
+
+      puts "\n# Logging of outgoing HTTP query args"
+      @@instrumentation.each do |config|
+        puts "AppOpticsAPM::Config[:#{config}][:log_args] = #{@@config[config][:log_args]}"
+      end
+
+      puts "\n# Bunny Controller and Action"
+      puts "AppOpticsAPM::Config[:bunnyconsumer][:controller] = #{@@config[:bunnyconsumer][:controller].inspect}"
+      puts "AppOpticsAPM::Config[:bunnyconsumer][:action] = #{@@config[:bunnyconsumer][:action].inspect}"
+      nil
     end
 
     ##
     # initialize
     #
-    # Initializer method to set everything up with a
-    # default configuration.
+    # Initializer method to set everything up with a default configuration.
+    # The defaults are read from the template configuration file.
     #
     # rubocop:disable Metrics/AbcSize
     def self.initialize(_data = {})
-      # Setup default instrumentation values
       @@instrumentation.each do |k|
         @@config[k] = {}
-        @@config[k][:enabled] = true
-        @@config[k][:collect_backtraces] = false
-        @@config[k][:log_args] = true
       end
-
-      # Beta instrumentation disabled by default
-      AppOpticsAPM::Config[:em_http_request][:enabled] = false
-
-      # Set collect_backtraces defaults
-      AppOpticsAPM::Config[:action_controller][:collect_backtraces] = false
-      AppOpticsAPM::Config[:action_controller_api][:collect_backtraces] = false
-      AppOpticsAPM::Config[:active_record][:collect_backtraces] = true
-      AppOpticsAPM::Config[:bunnyclient][:collect_backtraces] = false
-      AppOpticsAPM::Config[:bunnyconsumer][:collect_backtraces] = false
-      AppOpticsAPM::Config[:action_view][:collect_backtraces] = true
-      AppOpticsAPM::Config[:cassandra][:collect_backtraces] = true
-      AppOpticsAPM::Config[:curb][:collect_backtraces] = true
-      AppOpticsAPM::Config[:dalli][:collect_backtraces] = false
-      AppOpticsAPM::Config[:delayed_jobclient][:collect_backtraces] = false
-      AppOpticsAPM::Config[:delayed_jobworker][:collect_backtraces] = false
-      AppOpticsAPM::Config[:em_http_request][:collect_backtraces] = false
-      AppOpticsAPM::Config[:excon][:collect_backtraces] = true
-      AppOpticsAPM::Config[:faraday][:collect_backtraces] = false
-      AppOpticsAPM::Config[:grape][:collect_backtraces] = true
-      AppOpticsAPM::Config[:httpclient][:collect_backtraces] = true
-      AppOpticsAPM::Config[:memcached][:collect_backtraces] = false
-      AppOpticsAPM::Config[:mongo][:collect_backtraces] = true
-      AppOpticsAPM::Config[:moped][:collect_backtraces] = true
-      AppOpticsAPM::Config[:nethttp][:collect_backtraces] = true
-      AppOpticsAPM::Config[:rack][:collect_backtraces] = false
-      AppOpticsAPM::Config[:redis][:collect_backtraces] = false
-      AppOpticsAPM::Config[:resqueclient][:collect_backtraces] = true
-      AppOpticsAPM::Config[:resqueworker][:collect_backtraces] = false
-      AppOpticsAPM::Config[:rest_client][:collect_backtraces] = false
-      AppOpticsAPM::Config[:sequel][:collect_backtraces] = true
-      AppOpticsAPM::Config[:sidekiqclient][:collect_backtraces] = false
-      AppOpticsAPM::Config[:sidekiqworker][:collect_backtraces] = false
-      AppOpticsAPM::Config[:typhoeus][:collect_backtraces] = false
-
-      # Legacy Resque config support.  To be removed in a future version
-      @@config[:resque] = {}
-
-      # Setup an empty host blacklist (see: AppOpticsAPM::API::Util.blacklisted?)
-      @@config[:blacklist] = []
-
-      # Logging of outgoing HTTP query args
-      #
-      # This optionally disables the logging of query args of outgoing
-      # HTTP clients such as Net::HTTP, excon, typhoeus and others.
-      #
-      # This flag is global to all HTTP client instrumentation.
-      #
-      # To configure this on a per instrumentation basis, set this
-      # option to true and instead disable the instrumenstation specific
-      # option <tt>log_args</tt>:
-      #
-      #   AppOpticsAPM::Config[:nethttp][:log_args] = false
-      #   AppOpticsAPM::Config[:excon][:log_args] = false
-      #   AppOpticsAPM::Config[:typhoeus][:log_args] = true
-      #
-      @@config[:include_url_query_params] = true
-
-      # Logging of incoming HTTP query args
-      #
-      # This optionally disables the logging of incoming URL request
-      # query args.
-      #
-      # This flag is global and currently only affects the Rack
-      # instrumentation which reports incoming request URLs and
-      # query args by default.
-      @@config[:include_remote_url_params] = true
-
-      # The AppOpticsAPM Ruby gem has the ability to sanitize query literals
-      # from SQL statements.  By default this is enabled to
-      # avoid collecting and reporting query literals to AppOpticsAPM.
-      @@config[:sanitize_sql] = true
-
-      # The regular expression used to sanitize SQL.
-      @@config[:sanitize_sql_regexp] = '(\'[\s\S][^\']*\'|\d*\.\d+|\d+|NULL)'
-      @@config[:sanitize_sql_opts]   = Regexp::IGNORECASE
-
-      # Do Not Trace
-      # These two values allow you to configure specific URL patterns to
-      # never be traced.  By default, this is set to common static file
-      # extensions but you may want to customize this list for your needs.
-      #
-      # dnt_regexp and dnt_opts is passed to Regexp.new to create
-      # a regular expression object.  That is then used to match against
-      # the incoming request path.
-      #
-      # The path string originates from the rack layer and is retrieved
-      # as follows:
-      #
-      #   req = ::Rack::Request.new(env)
-      #   path = URI.unescape(req.path)
-      #
-      # Usage:
-      #   AppOpticsAPM::Config[:dnt_regexp] = "lobster$"
-      #   AppOpticsAPM::Config[:dnt_opts]   = Regexp::IGNORECASE
-      #
-      # This will ignore all requests that end with the string lobster
-      # regardless of case
-      #
-      # Requests with positive matches (non nil) will not be traced.
-      # See lib/appoptics_apm/util.rb: AppOpticsAPM::Util.static_asset?
-      #
-      @@config[:dnt_regexp] = '\.(jpg|jpeg|gif|png|ico|css|zip|tgz|gz|rar|bz2|pdf|txt|tar|wav|bmp|rtf|js|flv|swf|otf|eot|ttf|woff|woff2|svg|less)(\?.+){0,1}$'
-      @@config[:dnt_opts]   = Regexp::IGNORECASE
-
-      # In Rails, raised exceptions with rescue handlers via
-      # <tt>rescue_from</tt> are not reported to the AppOptics
-      # dashboard by default.  Setting this value to true will
-      # report all raised exception regardless.
-      #
-      @@config[:report_rescued_errors] = false
-
-      # The bunny (Rabbitmq) instrumentation can optionally report
-      # Controller and Action values to allow filtering of bunny
-      # message handling in # the UI.  Use of Controller and Action
-      # for filters is temporary until the UI is updated with
-      # additional filters.
-      #
-      # These values identify which properties of
-      # Bunny::MessageProperties to report as Controller
-      # and Action.  The defaults are to report :app_id (as
-      # Controller) and :type (as Action).  If these values
-      # are not specified in the publish, then nothing
-      # will be reported here.
-      #
-      @@config[:bunnyconsumer][:controller] = :app_id
-      @@config[:bunnyconsumer][:action] = :type
-
-      @@config[:verbose] = ENV.key?('APPOPTICS_GEM_VERBOSE') && ENV['APPOPTICS_GEM_VERBOSE'] == 'true' ? true : false
+     load(File.join(File.dirname(File.dirname(__FILE__)),
+                    'rails/generators/appoptics_apm/templates/appoptics_apm_initializer.rb'))
     end
     # rubocop:enable Metrics/AbcSize
 
@@ -235,21 +176,20 @@ module AppOpticsAPM
         AppOpticsAPM.logger.warn "[appoptics_apm/config] :resque config is deprecated.  It is now split into :resqueclient and :resqueworker."
         AppOpticsAPM.logger.warn "[appoptics_apm/config] Called from #{Kernel.caller[0]}"
 
-      elsif key == :include_url_query_params
+      elsif key == :include_url_query_params # DEPRECATED
         # Obey the global flag and update all of the per instrumentation
         # <tt>:log_args</tt> values.
         @@config[:rack][:log_args] = value
 
-      elsif key == :include_remote_url_params
+      elsif key == :include_remote_url_params # DEPRECATED
         # Obey the global flag and update all of the per instrumentation
         # <tt>:log_args</tt> values.
         @@http_clients.each do |i|
           @@config[i][:log_args] = value
         end
-      end
 
       # Update liboboe if updating :tracing_mode
-      if key == :tracing_mode
+      elsif key == :tracing_mode
         AppOpticsAPM.set_tracing_mode(value.to_sym) if AppOpticsAPM.loaded
 
         # Make sure that the mode is stored as a symbol

data/lib/appoptics_apm/support.rb

@@ -100,7 +100,7 @@ module AppOpticsAPM
     AppOpticsAPM.logger.warn '********************************************************'
     AppOpticsAPM.logger.warn '* AppOpticsAPM::Config Values'
     AppOpticsAPM.logger.warn '********************************************************'
-    AppOpticsAPM::Config.show.each { |k,v|
+    AppOpticsAPM::Config.config.each { |k,v|
       AppOpticsAPM.logger.warn "#{k}: #{v}"
     }
 

data/lib/appoptics_apm/util.rb

@@ -105,6 +105,9 @@ 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
 
       ##

data/lib/appoptics_apm/version.rb

@@ -8,7 +8,7 @@ module AppOpticsAPM
   module Version
     MAJOR = 4
     MINOR = 1
-    PATCH = 0
+    PATCH = 1
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

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

@@ -3,6 +3,8 @@
 #
 # More information on instrumenting Ruby applications can be found here:
 # https://docs.appoptics.com/kb/apm_tracing/ruby/
+#
+# The settings in this template file represent the defaults
 
 if defined?(AppOpticsAPM::Config)
 
@@ -18,37 +20,8 @@ if defined?(AppOpticsAPM::Config)
   #
   # Verbose output of instrumentation initialization
   #
-  # AppOpticsAPM::Config[:verbose] = <%= @verbose %>
-  #
-
-  #
-  # Logging of incoming HTTP query args
-  #
-  # This optionally disables the logging of incoming URL request
-  # query args.
-  #
-  # This flag is global and currently only affects the Rack
-  # instrumentation which reports incoming request URLs and
-  # query args by default.
-  AppOpticsAPM::Config[:include_remote_url_params] = true
-
-  #
-  # Logging of outgoing HTTP query args
-  #
-  # This optionally disables the logging of query args of outgoing
-  # HTTP clients such as Net::HTTP, excon, typhoeus and others.
-  #
-  # This flag is global to all HTTP client instrumentation.
-  #
-  # To configure this on a per instrumentation basis, set this
-  # option to true and instead disable the instrumentation specific
-  # option <tt>log_args</tt>:
-  #
-  #   AppOpticsAPM::Config[:nethttp][:log_args] = false
-  #   AppOpticsAPM::Config[:excon][:log_args] = false
-  #   AppOpticsAPM::Config[:typhoeus][:log_args] = true
+  AppOpticsAPM::Config[:verbose] = ENV.key?('APPOPTICS_GEM_VERBOSE') && ENV['APPOPTICS_GEM_VERBOSE'] == 'true' ? true : false
   #
-  AppOpticsAPM::Config[:include_url_query_params] = true
 
   #
   # Sanitize SQL Statements
@@ -57,9 +30,11 @@ if defined?(AppOpticsAPM::Config)
   # from SQL statements.  By default this is enabled.  Disable to
   # collect and report query literals to AppOpticsAPM.
   #
-  # AppOpticsAPM::Config[:sanitize_sql] = true
-  #
+  AppOpticsAPM::Config[:sanitize_sql] = true
+  AppOpticsAPM::Config[:sanitize_sql_regexp] = '(\'[\s\S][^\']*\'|\d*\.\d+|\d+|NULL)'
+  AppOpticsAPM::Config[:sanitize_sql_opts]   = Regexp::IGNORECASE
 
+  #
   # Do Not Trace
   # These two values allow you to configure specific URL patterns to
   # never be traced.  By default, this is set to common static file
@@ -85,8 +60,8 @@ if defined?(AppOpticsAPM::Config)
   # Requests with positive matches (non nil) will not be traced.
   # See lib/appoptics_apm/util.rb: AppOpticsAPM::Util.static_asset?
   #
-  # AppOpticsAPM::Config[:dnt_regexp] = "\.(jpg|jpeg|gif|png|ico|css|zip|tgz|gz|rar|bz2|pdf|txt|tar|wav|bmp|rtf|js|flv|swf|ttf|woff|svg|less)$"
-  # AppOpticsAPM::Config[:dnt_opts]   = Regexp::IGNORECASE
+  AppOpticsAPM::Config[:dnt_regexp] = '\.(jpg|jpeg|gif|png|ico|css|zip|tgz|gz|rar|bz2|pdf|txt|tar|wav|bmp|rtf|js|flv|swf|otf|eot|ttf|woff|woff2|svg|less)(\?.+){0,1}$'
+  AppOpticsAPM::Config[:dnt_opts]   = Regexp::IGNORECASE
 
   #
   # Blacklist urls
@@ -99,7 +74,7 @@ if defined?(AppOpticsAPM::Config)
   #
   # Example: AppOpticsAPM::Config[:blacklist] = ['google.com']
   #
-  # AppOpticsAPM::Config[:blacklist]
+  AppOpticsAPM::Config[:blacklist] = []
   #
 
   #
@@ -110,7 +85,7 @@ if defined?(AppOpticsAPM::Config)
   # dashboard by default.  Setting this value to true will
   # report all raised exception regardless.
   #
-  # AppOpticsAPM::Config[:report_rescued_errors] = false
+  AppOpticsAPM::Config[:report_rescued_errors] = false
   #
 
   #
@@ -129,54 +104,66 @@ if defined?(AppOpticsAPM::Config)
   # are not specified in the publish, then nothing
   # will be reported here.
   #
-  # AppOpticsAPM::Config[:bunnyconsumer][:controller] = :app_id
-  # AppOpticsAPM::Config[:bunnyconsumer][:action] = :type
+  AppOpticsAPM::Config[:bunnyconsumer][:controller] = :app_id
+  AppOpticsAPM::Config[:bunnyconsumer][:action] = :type
   #
 
   #
-  # Resque Argument logging
+  # Enabling/Disabling Instrumentation
   #
-  # Set to true to enable Resque argument logging (Default: false)
+  # If you're having trouble with one of the instrumentation libraries, they
+  # can be individually disabled here by setting the :enabled
+  # value to false:
   #
-  # AppOpticsAPM::Config[:resqueworker][:log_args] = false
-  # AppOpticsAPM::Config[:resqueclient[:log_args] = false
+  AppOpticsAPM::Config[:action_controller][:enabled] = true
+  AppOpticsAPM::Config[:action_controller_api][:enabled] = true
+  AppOpticsAPM::Config[:action_view][:enabled] = true
+  AppOpticsAPM::Config[:active_record][:enabled] = true
+  AppOpticsAPM::Config[:bunnyclient][:enabled] = true
+  AppOpticsAPM::Config[:bunnyconsumer][:enabled] = true
+  AppOpticsAPM::Config[:cassandra][:enabled] = true
+  AppOpticsAPM::Config[:curb][:enabled] = true
+  AppOpticsAPM::Config[:dalli][:enabled] = true
+  AppOpticsAPM::Config[:delayed_jobclient][:enabled] = true
+  AppOpticsAPM::Config[:delayed_jobworker][:enabled] = true
+  AppOpticsAPM::Config[:em_http_request][:enabled] = false
+  AppOpticsAPM::Config[:excon][:enabled] = true
+  AppOpticsAPM::Config[:faraday][:enabled] = true
+  AppOpticsAPM::Config[:grape][:enabled] = true
+  AppOpticsAPM::Config[:httpclient][:enabled] = true
+  AppOpticsAPM::Config[:memcached][:enabled] = true
+  AppOpticsAPM::Config[:mongo][:enabled] = true
+  AppOpticsAPM::Config[:moped][:enabled] = true
+  AppOpticsAPM::Config[:nethttp][:enabled] = true
+  AppOpticsAPM::Config[:rack][:enabled] = true
+  AppOpticsAPM::Config[:redis][:enabled] = true
+  AppOpticsAPM::Config[:resqueclient][:enabled] = true
+  AppOpticsAPM::Config[:resqueworker][:enabled] = true
+  AppOpticsAPM::Config[:rest_client][:enabled] = true
+  AppOpticsAPM::Config[:sequel][:enabled] = true
+  AppOpticsAPM::Config[:sidekiqclient][:enabled] = true
+  AppOpticsAPM::Config[:sidekiqworker][:enabled] = true
+  AppOpticsAPM::Config[:typhoeus][:enabled] = true
   #
 
   #
-  # Enabling/Disabling Instrumentation
+  # Argument logging
   #
-  # If you're having trouble with one of the instrumentation libraries, they
-  # can be individually disabled here by setting the :enabled
-  # value to false:
+  # for http requests
+  # Set to true to enable argument logging
   #
-  # AppOpticsAPM::Config[:action_controller][:enabled] = true
-  # AppOpticsAPM::Config[:action_controller_api][:enabled] = true
-  # AppOpticsAPM::Config[:action_view][:enabled] = true
-  # AppOpticsAPM::Config[:active_record][:enabled] = true
-  # AppOpticsAPM::Config[:bunnyclient][:enabled] = true
-  # AppOpticsAPM::Config[:bunnyconsumer][:enabled] = true
-  # AppOpticsAPM::Config[:cassandra][:enabled] = true
-  # AppOpticsAPM::Config[:curb][:enabled] = true
-  # AppOpticsAPM::Config[:dalli][:enabled] = true
-  # AppOpticsAPM::Config[:delayed_jobclient][:enabled] = true
-  # AppOpticsAPM::Config[:delayed_jobworker][:enabled] = true
-  # AppOpticsAPM::Config[:em_http_request][:enabled] = true
-  # AppOpticsAPM::Config[:excon][:enabled] = true
-  # AppOpticsAPM::Config[:faraday][:enabled] = true
-  # AppOpticsAPM::Config[:grape][:enabled] = true
-  # AppOpticsAPM::Config[:httpclient][:enabled] = true
-  # AppOpticsAPM::Config[:memcached][:enabled] = true
-  # AppOpticsAPM::Config[:mongo][:enabled] = true
-  # AppOpticsAPM::Config[:moped][:enabled] = true
-  # AppOpticsAPM::Config[:nethttp][:enabled] = true
-  # AppOpticsAPM::Config[:redis][:enabled] = true
-  # AppOpticsAPM::Config[:resqueclient][:enabled] = true
-  # AppOpticsAPM::Config[:resqueworker][:enabled] = true
-  # AppOpticsAPM::Config[:rest_client][:enabled] = true
-  # AppOpticsAPM::Config[:sequel][:enabled] = true
-  # AppOpticsAPM::Config[:sidekiqclient][:enabled] = true
-  # AppOpticsAPM::Config[:sidekiqworker][:enabled] = true
-  # AppOpticsAPM::Config[:typhoeus][:enabled] = true
+  AppOpticsAPM::Config[:bunnyconsumer][:log_args] = true
+  AppOpticsAPM::Config[:curb][:log_args] = true
+  AppOpticsAPM::Config[:excon][:log_args] = true
+  AppOpticsAPM::Config[:httpclient][:log_args] = true
+  AppOpticsAPM::Config[:mongo][:log_args] = true
+  AppOpticsAPM::Config[:nethttp][:log_args] = true
+  AppOpticsAPM::Config[:rack][:log_args] = true
+  AppOpticsAPM::Config[:resqueclient][:log_args] = true
+  AppOpticsAPM::Config[:resqueworker][:log_args] = true
+  AppOpticsAPM::Config[:sidekiqclient][:log_args] = true
+  AppOpticsAPM::Config[:sidekiqworker][:log_args] = true
+  AppOpticsAPM::Config[:typhoeus][:log_args] = true
   #
 
   #
@@ -187,34 +174,34 @@ if defined?(AppOpticsAPM::Config)
   # performance but can be useful when trying to locate the source of
   # a certain call or operation.
   #
-  # AppOpticsAPM::Config[:action_controller][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:action_controller_api][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:action_view][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:active_record][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:bunnyclient][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:bunnyconsumer][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:cassandra][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:curb][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:dalli][:collect_backtraces] = false
-  # AppOpticsAPM::Config[:delayed_jobclient][:collect_backtraces] = false
-  # AppOpticsAPM::Config[:delayed_jobworker][:collect_backtraces] = false
-  # AppOpticsAPM::Config[:em_http_request][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:excon][:collect_backtraces] = false
-  # AppOpticsAPM::Config[:faraday][:collect_backtraces] = false
-  # AppOpticsAPM::Config[:grape][:collect_backtraces] = false
-  # AppOpticsAPM::Config[:httpclient][:collect_backtraces] = false
-  # AppOpticsAPM::Config[:memcached][:collect_backtraces] = false
-  # AppOpticsAPM::Config[:mongo][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:moped][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:nethttp][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:rack][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:redis][:collect_backtraces] = false
-  # AppOpticsAPM::Config[:resqueclient][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:resqueworker][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:rest_client][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:sequel][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:sidekiqclient][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:sidekiqworker][:collect_backtraces] = true
-  # AppOpticsAPM::Config[:typhoeus][:collect_backtraces] = false
-  #
+  AppOpticsAPM::Config[:action_controller][:collect_backtraces] = true
+  AppOpticsAPM::Config[:action_controller_api][:collect_backtraces] = true
+  AppOpticsAPM::Config[:action_view][:collect_backtraces] = true
+  AppOpticsAPM::Config[:active_record][:collect_backtraces] = true
+  AppOpticsAPM::Config[:bunnyclient][:collect_backtraces] = false
+  AppOpticsAPM::Config[:bunnyconsumer][:collect_backtraces] = false
+  AppOpticsAPM::Config[:cassandra][:collect_backtraces] = true
+  AppOpticsAPM::Config[:curb][:collect_backtraces] = true
+  AppOpticsAPM::Config[:dalli][:collect_backtraces] = false
+  AppOpticsAPM::Config[:delayed_jobclient][:collect_backtraces] = false
+  AppOpticsAPM::Config[:delayed_jobworker][:collect_backtraces] = false
+  AppOpticsAPM::Config[:em_http_request][:collect_backtraces] = true
+  AppOpticsAPM::Config[:excon][:collect_backtraces] = true
+  AppOpticsAPM::Config[:faraday][:collect_backtraces] = false
+  AppOpticsAPM::Config[:grape][:collect_backtraces] = true
+  AppOpticsAPM::Config[:httpclient][:collect_backtraces] = true
+  AppOpticsAPM::Config[:memcached][:collect_backtraces] = false
+  AppOpticsAPM::Config[:mongo][:collect_backtraces] = true
+  AppOpticsAPM::Config[:moped][:collect_backtraces] = true
+  AppOpticsAPM::Config[:nethttp][:collect_backtraces] = true
+  AppOpticsAPM::Config[:rack][:collect_backtraces] = true
+  AppOpticsAPM::Config[:redis][:collect_backtraces] = false
+  AppOpticsAPM::Config[:resqueclient][:collect_backtraces] = true
+  AppOpticsAPM::Config[:resqueworker][:collect_backtraces] = true
+  AppOpticsAPM::Config[:rest_client][:collect_backtraces] = true
+  AppOpticsAPM::Config[:sequel][:collect_backtraces] = true
+  AppOpticsAPM::Config[:sidekiqclient][:collect_backtraces] = false
+  AppOpticsAPM::Config[:sidekiqworker][:collect_backtraces] = false
+  AppOpticsAPM::Config[:typhoeus][:collect_backtraces] = false
+
 end

data/run_docker_build_gem_upload_to_packagecloud.sh

@@ -6,7 +6,7 @@ docker build -f Dockerfile -t buildgem .
 # build the gems in the image
 docker run --rm  -v `pwd`:/code/ruby-appoptics_apm buildgem bash -l -c 'cd /code/ruby-appoptics_apm && ./build_gems.sh'
 
-# save current rbenv setting and switch to 2.4.1 for the package_cloud commands
+# save current rbenv setting and switch to 2.4.3 for the package_cloud commands
 current_ruby=`rbenv local`
 rbenv local 2.4.1
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appoptics_apm
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Maia Engeli
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -26,6 +26,26 @@ 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
@@ -85,7 +105,8 @@ dependencies:
 description: The AppOpticsAPM gem provides performance instrumentation for MRI Ruby
   and related frameworks.
 email: support@appoptics.com
-executables: []
+executables:
+- appoptics_apm_config
 extensions:
 - ext/oboe_metal/extconf.rb
 extra_rdoc_files:
@@ -108,7 +129,9 @@ files:
 - Rakefile
 - Vagrantfile
 - appoptics_apm.gemspec
+- bin/appoptics_apm_config
 - build_gems.sh
+- config/initializers/.keep
 - docker-compose.yml
 - examples/DNT.md
 - examples/carrying_context.rb
@@ -129,7 +152,6 @@ files:
 - ext/oboe_metal/src/oboe_debug.h
 - ext/oboe_metal/src/oboe_wrap.cxx
 - ext/oboe_metal/tests/test.rb
-- get_version.rb
 - init.rb
 - lib/appoptics_apm.rb
 - lib/appoptics_apm/api.rb

data/get_version.rb

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/lib/oboe/version.rb'
-
-puts Oboe::Version::STRING