scout_apm 3.0.0.pre7 → 3.0.0.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 622bc9489b9add4f80ca65cd3b12e54e30eea269
-  data.tar.gz: ef00b8380eb4e163cf9b991b826287d63ba27819
+  metadata.gz: 63c9b4319eecbefb59fdb10fb0fbc0d264dfb7a0
+  data.tar.gz: 821271be9ef95416e72b659a825895513d80017d
 SHA512:
-  metadata.gz: 2057aaca2029567dd1a7ce09fb8b359cc2819566e0a03ef528f91b051e00170be7fef66dfe339186bc77d030c7e738be2bc3517b8306e874ce38c662988c46a2
-  data.tar.gz: 4e45127ed587dd0e86782d357f1916de915acff6698682f2b6920448ba63245a5412549d27efe7fff1e270b8bfc0e57d36cc7273ae94f1af4f83a348b525b9aa
+  metadata.gz: 330d8721be955d8676285665d7db211919b1867da0720b1b24c663119f434cb7aaffa9a55cec27d8286633d40d924b337283fea0c45195d872900f54a3c6c041
+  data.tar.gz: 0eef9b024471d03e689aaceffd56402c32a5f0904e6c9124209bb60e4d06173f281fc25b3562225303b5c8292be7daab2f5233618a098454c646da597d4913fa

data/CHANGELOG.markdown

@@ -2,6 +2,11 @@
 
 * ScoutProf BETA
 
+# 2.1.19
+
+* Log all configuration settings at start when log level is debug
+* Tune DelayedJob class name detection
+
 # 2.1.18
 
 * Max layaway file threshold limit

data/lib/scout_apm/agent.rb

@@ -118,6 +118,8 @@ module ScoutApm
       init_logger
       logger.info "Attempting to start Scout Agent [#{ScoutApm::VERSION}] on [#{environment.hostname}]"
 
+      @config.log_settings
+
       @ignored_uris = ScoutApm::IgnoredUris.new(config.value('ignore'))
 
       load_instruments if should_load_instruments?(options)

data/lib/scout_apm/background_job_integrations/delayed_job.rb

@@ -2,6 +2,7 @@ module ScoutApm
   module BackgroundJobIntegrations
     class DelayedJob
       ACTIVE_JOB_KLASS = 'ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper'.freeze
+      DJ_PERFORMABLE_METHOD = 'Delayed::PerformableMethod'.freeze
 
       attr_reader :logger
 
@@ -26,14 +27,27 @@ module ScoutApm
               ScoutApm::Agent.instance.start_background_worker unless ScoutApm::Agent.instance.background_worker_running?
 
               name = begin
-                       if job.payload_object.class.to_s == ACTIVE_JOB_KLASS
+                       case job.payload_object.class.to_s
+
+                       # ActiveJob's class wraps the actual job class
+                       when ACTIVE_JOB_KLASS
                          job.payload_object.job_data["job_class"]
-                       else
+
+                       # An adhoc job, called like `@user.delay.fib(10)`.
+                       # returns a string like "User#fib"
+                       when DJ_PERFORMABLE_METHOD
                          job.name
+
+                       # A "real" job called like `Delayed::Job.enqueue(MyJob.new)`
+                       # returns "MyJob"
+                       else
+                         job.payload_object.class.to_s
                        end
                      rescue
+                       # Fall back to whatever DJ thinks the name is.
                        job.name
                      end
+
               queue = job.queue || "default"
 
               req = ScoutApm::RequestManager.lookup

data/lib/scout_apm/config.rb

@@ -165,12 +165,17 @@ module ScoutApm
       @overlays = Array(overlays)
     end
 
+    # For a given key, what is the first overlay says that it can handle it?
+    def overlay_for_key(key)
+      @overlays.detect{ |overlay| overlay.has_key?(key) }
+    end
+
     def value(key)
       if ! KNOWN_CONFIG_OPTIONS.include?(key)
         ScoutApm::Agent.instance.logger.debug("Requested looking up a unknown configuration key: #{key} (not a problem. Evaluate and add to config.rb)")
       end
 
-      o = @overlays.detect{ |overlay| overlay.has_key?(key) }
+      o = overlay_for_key(key)
       raw_value = if o
                     o.value(key)
                   else
@@ -187,6 +192,14 @@ module ScoutApm
       @overlays.any? { |overlay| overlay.any_keys_found? }
     end
 
+    def log_settings
+      messages = KNOWN_CONFIG_OPTIONS.inject([]) do |memo, key|
+        o = overlay_for_key(key)
+        memo << "#{o.name} - #{key}: #{value(key).inspect}"
+      end
+      ScoutApm::Agent.instance.logger.debug("Resolved Setting Values:\n" + messages.join("\n"))
+    end
+
     class ConfigDefaults
       DEFAULTS = {
         'compress_payload'       => true,
@@ -214,6 +227,10 @@ module ScoutApm
       def any_keys_found?
         false
       end
+
+      def name
+        "defaults"
+      end
     end
 
 
@@ -232,6 +249,10 @@ module ScoutApm
       def any_keys_found?
         false
       end
+
+      def name
+        "no-config"
+      end
     end
 
     class ConfigEnvironment
@@ -253,6 +274,10 @@ module ScoutApm
           ENV.has_key?(key_to_env_key(option))
         }
       end
+
+      def name
+        "environment"
+      end
     end
 
     # Attempts to load a configuration file, and parse it as YAML. If the file
@@ -284,6 +309,10 @@ module ScoutApm
         }
       end
 
+      def name
+        "config-file"
+      end
+
       private
 
       def load_file(file)

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "3.0.0.pre7"
+  VERSION = "3.0.0.pre8"
 end

data/test/unit/config_test.rb

@@ -32,7 +32,7 @@ class ConfigTest < Minitest::Test
     conf = ScoutApm::Config.with_file(conf_file, environment: "staging")
 
     assert_equal "info", conf.value('log_level') # the default value
-    assert_equal nil, conf.value('name')         # the default value
+    assert_nil nil, conf.value('name')         # the default value
   end
 
   def test_boolean_coercion

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre7
+  version: 3.0.0.pre8
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -292,8 +292,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring
-test_files: []
+test_files:
+- test/data/config_test_1.yml
+- test/test_helper.rb
+- test/unit/agent_test.rb
+- test/unit/background_job_integrations/sidekiq_test.rb
+- test/unit/config_test.rb
+- test/unit/context_test.rb
+- test/unit/environment_test.rb
+- test/unit/git_revision_test.rb
+- test/unit/histogram_test.rb
+- test/unit/ignored_uris_test.rb
+- test/unit/instruments/active_record_instruments_test.rb
+- test/unit/instruments/net_http_test.rb
+- test/unit/instruments/percentile_sampler_test.rb
+- test/unit/layaway_test.rb
+- test/unit/layer_children_set_test.rb
+- test/unit/limited_layer_test.rb
+- test/unit/metric_set_test.rb
+- test/unit/scored_item_set_test.rb
+- test/unit/serializers/payload_serializer_test.rb
+- test/unit/slow_job_policy_test.rb
+- test/unit/slow_request_policy_test.rb
+- test/unit/sql_sanitizer_test.rb
+- test/unit/store_test.rb
+- test/unit/utils/active_record_metric_name_test.rb
+- test/unit/utils/backtrace_parser_test.rb
+- test/unit/utils/numbers_test.rb