scout_apm 3.0.0.pre25 → 3.0.0.pre26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d2364c7ae5bfc518cc19c5059e90959a15203bc
-  data.tar.gz: 45a2372a9d6a96460b946419ec02c3ceb63a4d2d
+  metadata.gz: d464aa5c996bd02a57ce41e4fe6891ea7cac1c27
+  data.tar.gz: ac8778e12b752200d391e0dd8a5e9e56e19ac5e7
 SHA512:
-  metadata.gz: 607f2bf5f3b6eedab959e49c277972f00c72c03d408782a8cc0466a7fc44a2e5dce11a4279da227f64cb5baeda9d1ad4ed8ead972687906abd19750973e7246b
-  data.tar.gz: 0bb02a39eb5dd459665b9049038e275e08fe3ddd60a1ffcb5b2d6af1f7f31f8291d58eaac2a8cac577527a8a046167f2492058af6e20d7f725691b25e0b1d40f
+  metadata.gz: a3554af6cc62a696af7fcfc31b027bd54294f80159b19cc5727fd2946c00cc53d04e1cdaf82c72bf956e011bb21f7ccc3da31a7a510aa021ef7fda74ec9d0667
+  data.tar.gz: 421dbf05b82468f80a40e4b7fa95d45e890bc1a68e401476603c54728b3f50f9282d304bf57044a60c0750d1fc51b0ae0ccc4d2fc60f6ccdfcebe77068b95711

data/CHANGELOG.markdown

@@ -2,6 +2,15 @@
 
 * ScoutProf BETA
 
+# 2.4.15
+
+* Fix bug that causes no data to be reported to Scout when DataDog is installed (#211)
+* Fix `NoMethodError for LayerChildrenSet` when `log_level: debug` in certain situations.
+
+# 2.4.14
+
+* Fix database connection issue when installed in an app also using the Textacular gem
+
 # 2.4.13
 
 * Incorporating total time consumed into transaction trace policy

data/README.markdown

@@ -38,6 +38,23 @@ Your config file should look like:
     production:
       <<: *defaults
 
+## DevTrace Quickstart
+
+To use DevTrace, our free, no-signup, in-browser development profiler:
+
+1. Add the gem to your Gemfile:
+
+```ruby
+# Gemfile
+gem 'scout_apm'
+```
+
+2. Start your Rails app with the SCOUT_DEV_TRACE environment variable:
+
+```
+SCOUT_DEV_TRACE=true rails server
+```
+
 ## Docs
 
 For the complete list of supported frameworks, Rubies, configuration options

data/lib/scout_apm/framework_integrations/rails_3_or_4.rb

@@ -55,12 +55,21 @@ module ScoutApm
         end
       end
 
+      # Note, this code intentionally avoids `.respond_to?` because of an
+      # infinite loop created by the Textacular gem (tested against 3.2.2 of
+      # that gem), which some customers have installed.
+      #
+      # The loop was:
+      #   - Ask for database adapter
+      #   - Do .respond_to? on AR::Base to look for connection_config (which isn't present on some versions of rails)
+      #   - Textacular gem has a monkey-patch that queries the columns of the db
+      #     This obtains a connection, and runs a query.
+      #   - Scout tries to run SQLSanitizer against the query, which needs the database adapter.
+      #   - Goes back to first step.
+      #
+      # We avoid this issue by not calling .respond_to? here, and instead using the less optimal `rescue nil` approach
       def raw_database_adapter
-        adapter = if ActiveRecord::Base.respond_to?(:connection_config)
-                    ActiveRecord::Base.connection_config[:adapter].to_s
-                  else
-                    nil
-                  end
+        adapter = ActiveRecord::Base.connection_config[:adapter].to_s rescue nil
 
         if adapter.nil?
           adapter = ActiveRecord::Base.configurations[env]["adapter"]

data/lib/scout_apm/instruments/active_record.rb

@@ -142,7 +142,10 @@ module ScoutApm
             req = ScoutApm::RequestManager.lookup
             layer = req.current_layer
             if layer && layer.type == "ActiveRecord"
-              layer.annotate_layer(payload)
+              layer.annotate_layer({
+                :class_name => payload[:class_name],
+                :record_count => payload[:record_count]
+              })
             elsif layer
               logger.debug("Expected layer type: ActiveRecord, got #{layer && layer.type}")
             else

data/lib/scout_apm/layer_children_set.rb

@@ -69,6 +69,14 @@ module ScoutApm
       end
     end
 
+    def length
+      @children.length
+    end
+
+    def size
+      @children.size
+    end
+
     # hold off initializing this until we know we need it
     def init_limited_layers
       @limited_layers ||= Hash.new { |hash, key| hash[key] = LimitedLayer.new(key) }

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "3.0.0.pre25"
+  VERSION = "3.0.0.pre26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre25
+  version: 3.0.0.pre26
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -397,52 +397,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.5
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring
-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/db_query_metric_set_test.rb
-- test/unit/db_query_metric_stats_test.rb
-- test/unit/environment_test.rb
-- test/unit/extensions/periodic_callbacks_test.rb
-- test/unit/extensions/transaction_callbacks_test.rb
-- test/unit/fake_store_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/layer_converters/depth_first_walker_test.rb
-- test/unit/layer_converters/metric_converter_test.rb
-- test/unit/layer_converters/stubs.rb
-- test/unit/limited_layer_test.rb
-- test/unit/logger_test.rb
-- test/unit/metric_set_test.rb
-- test/unit/remote/test_message.rb
-- test/unit/remote/test_router.rb
-- test/unit/remote/test_server.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/tracer_test.rb
-- test/unit/tracked_request_test.rb
-- test/unit/transaction_test.rb
-- test/unit/transaction_time_consumed_test.rb
-- test/unit/utils/active_record_metric_name_test.rb
-- test/unit/utils/backtrace_parser_test.rb
-- test/unit/utils/numbers_test.rb
-- test/unit/utils/scm.rb
-has_rdoc: 
+test_files: []