scout_apm 4.0.4 → 5.0.0

data/test/unit/serializers/payload_serializer_test.rb

@@ -8,7 +8,7 @@ class PayloadSerializerTest < Minitest::Test
       :unique_id => "unique_idz",
       :agent_version => 123
     }
-    payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize(metadata, {}, {}, [], [], [], {}, [])
+    payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize(metadata, {}, {}, [], [], [], {}, {}, [])
 
     # symbol keys turn to strings
     formatted_metadata = {
@@ -49,7 +49,7 @@ class PayloadSerializerTest < Minitest::Test
         stats.total_exclusive_time = 0.078132088
       }
     }
-    payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize({}, metrics, {}, [], [], [], {}, [])
+    payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize({}, metrics, {}, [], [], [], {}, {}, [])
     formatted_metrics = [
       {
         "key" => {
@@ -94,7 +94,7 @@ class PayloadSerializerTest < Minitest::Test
       :quotie => "here are some \"quotes\"",
       :payload_version => 2,
     }
-    payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize(metadata, {}, {}, [], [], [], {}, [])
+    payload = ScoutApm::Serializers::PayloadSerializerToJson.serialize(metadata, {}, {}, [], [], [], {}, {}, [])
 
     # symbol keys turn to strings
     formatted_metadata = {

data/test/unit/sql_sanitizer_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 require 'test_helper'
 
 module ScoutApm
@@ -38,9 +40,9 @@ module ScoutApm
       end
 
       def test_postgres_strips_subquery_strings
-        raw_sql = %q|"SELECT 'orgs'.* FROM "orgs" WHERE  "orgs"."name" = 'Scout' AND "orgs"."created_by_user_id" IN (SELECT 'users'.'id' FROM "users" WHERE (id > AVG(id)) AND "type" = 'USER' AND "created_at" BETWEEN '2019-04-17 12:28:00.000000' AND '2019-04-18 12:28:00.000000')"|
+        raw_sql = %q|"SELECT "orgs".* FROM "orgs" WHERE  "orgs"."name" = 'Scout' AND "orgs"."created_by_user_id" IN (SELECT "users"."id" FROM "users" WHERE (id > AVG(id)) AND "type" = 'USER' AND "created_at" BETWEEN '2019-04-17 12:28:00.000000' AND '2019-04-18 12:28:00.000000')"|
         sanitized_sql = SqlSanitizer.new(raw_sql).tap { |it| it.database_engine = :postgres}
-        expected_sql = %q|"SELECT 'orgs'.* FROM "orgs" WHERE "orgs"."name" = ? AND "orgs"."created_by_user_id" IN (SELECT 'users'.'id' FROM "users" WHERE (id > AVG(id)) AND "type" = ? AND "created_at" BETWEEN ? AND ?)"|
+        expected_sql = %q|"SELECT "orgs".* FROM "orgs" WHERE "orgs"."name" = ? AND "orgs"."created_by_user_id" IN (SELECT "users"."id" FROM "users" WHERE (id > AVG(id)) AND "type" = ? AND "created_at" BETWEEN ? AND ?)"|
         assert_equal expected_sql, sanitized_sql.to_s
       end
 
@@ -66,6 +68,21 @@ module ScoutApm
         end
       end
 
+      def test_postgres_inner_join_subquery
+        sql = %q{SELECT x AS y
+         FROM t1 
+         INNER JOIN (
+           SELECT id,
+           (ts_rank((to_tsvector('simple', coalesce("pg_search_documents"."content"::text, ''))), (to_tsquery('simple', 'xyz' || 'omg' || 'secret')), ?)) AS rank
+           FROM t2
+           WHERE name = 'literal') sub ON sub.id = t1.id WHERE age > 10}
+
+        expected = %q{SELECT x AS y FROM t1 INNER JOIN ( SELECT id, (ts_rank((to_tsvector(?, coalesce("pg_search_documents"."content"::text, ?))), (to_tsquery(?, ? || ? || ?)), ?)) AS rank FROM t2 WHERE name = ?) sub ON sub.id = t1.id WHERE age > ?}
+        ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :postgres }
+
+        assert_equal expected, ss.to_s
+      end
+
       def test_mysql_where
         sql = %q|SELECT `users`.* FROM `users` WHERE `users`.`name` = ?  [["name", "chris"]]|
         ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :mysql }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 5.0.0
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -219,7 +219,6 @@ files:
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.markdown
 - Gemfile
 - Guardfile
@@ -238,6 +237,7 @@ files:
 - gems/rails4.gemfile
 - gems/rails5.gemfile
 - gems/rails6.gemfile
+- gems/typhoeus.gemfile
 - lib/scout_apm.rb
 - lib/scout_apm/agent.rb
 - lib/scout_apm/agent/exit_handler.rb
@@ -282,6 +282,8 @@ files:
 - lib/scout_apm/error_service/sidekiq.rb
 - lib/scout_apm/extensions/config.rb
 - lib/scout_apm/extensions/transaction_callback_payload.rb
+- lib/scout_apm/external_service_metric_set.rb
+- lib/scout_apm/external_service_metric_stats.rb
 - lib/scout_apm/fake_store.rb
 - lib/scout_apm/framework_integrations/rails_2.rb
 - lib/scout_apm/framework_integrations/rails_3_or_4.rb
@@ -328,6 +330,7 @@ files:
 - lib/scout_apm/layer_converters/database_converter.rb
 - lib/scout_apm/layer_converters/depth_first_walker.rb
 - lib/scout_apm/layer_converters/error_converter.rb
+- lib/scout_apm/layer_converters/external_service_converter.rb
 - lib/scout_apm/layer_converters/find_layer_by_type.rb
 - lib/scout_apm/layer_converters/histograms.rb
 - lib/scout_apm/layer_converters/job_converter.rb
@@ -359,6 +362,7 @@ files:
 - lib/scout_apm/serializers/app_server_load_serializer.rb
 - lib/scout_apm/serializers/db_query_serializer_to_json.rb
 - lib/scout_apm/serializers/directive_serializer.rb
+- lib/scout_apm/serializers/external_service_serializer_to_json.rb
 - lib/scout_apm/serializers/histograms_serializer_to_json.rb
 - lib/scout_apm/serializers/jobs_serializer_to_json.rb
 - lib/scout_apm/serializers/metrics_to_json_serializer.rb
@@ -398,8 +402,6 @@ files:
 - lib/scout_apm/utils/numbers.rb
 - lib/scout_apm/utils/scm.rb
 - lib/scout_apm/utils/sql_sanitizer.rb
-- lib/scout_apm/utils/sql_sanitizer_regex.rb
-- lib/scout_apm/utils/sql_sanitizer_regex_1_8_7.rb
 - lib/scout_apm/utils/time.rb
 - lib/scout_apm/utils/unique_id.rb
 - lib/scout_apm/version.rb
@@ -410,11 +412,13 @@ files:
 - test/tmp/README.md
 - test/unit/agent_context_test.rb
 - test/unit/agent_test.rb
+- test/unit/auto_instrument/anonymous_block_value.rb
 - test/unit/auto_instrument/assignments-instrumented.rb
 - test/unit/auto_instrument/assignments.rb
 - test/unit/auto_instrument/controller-ast.txt
 - test/unit/auto_instrument/controller-instrumented.rb
 - test/unit/auto_instrument/controller.rb
+- test/unit/auto_instrument/hanging_method.rb
 - test/unit/auto_instrument/rescue_from-instrumented.rb
 - test/unit/auto_instrument/rescue_from.rb
 - test/unit/auto_instrument_test.rb
@@ -428,6 +432,8 @@ files:
 - test/unit/error_service/ignored_exceptions_test.rb
 - test/unit/extensions/periodic_callbacks_test.rb
 - test/unit/extensions/transaction_callbacks_test.rb
+- test/unit/external_service_metric_set_test.rb
+- test/unit/external_service_metric_stats_test.rb
 - test/unit/fake_store_test.rb
 - test/unit/git_revision_test.rb
 - test/unit/histogram_test.rb
@@ -435,6 +441,7 @@ files:
 - test/unit/instruments/active_record_test.rb
 - test/unit/instruments/net_http_test.rb
 - test/unit/instruments/percentile_sampler_test.rb
+- test/unit/instruments/typhoeus_test.rb
 - test/unit/layaway_test.rb
 - test/unit/layer_children_set_test.rb
 - test/unit/layer_converters/depth_first_walker_test.rb
@@ -443,9 +450,9 @@ files:
 - 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/remote/message_test.rb
+- test/unit/remote/route_test.rb
+- test/unit/remote/server_test.rb
 - test/unit/request_histograms_test.rb
 - test/unit/scored_item_set_test.rb
 - test/unit/serializers/payload_serializer_test.rb
@@ -480,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring

data/.travis.yml

@@ -1,22 +0,0 @@
-language: ruby
-dist: xenial
-cache: bundler
-
-matrix:
-  include:
-    - rvm: 2.1
-      gemfile: gems/rails3.gemfile
-    - rvm: 2.2
-    - rvm: 2.3
-    - rvm: 2.4
-    - rvm: 2.5
-    - rvm: 2.6
-    - rvm: 2.7
-    - rvm: 3.0
-    - rvm: 2.6
-      gemfile: gems/octoshark.gemfile
-    - rvm: 2.6
-      name: rubocop yo
-      script: bundle exec rubocop
-    - rvm: 2.6
-      gemfile: gems/rails3.gemfile

data/lib/scout_apm/utils/sql_sanitizer_regex.rb

@@ -1,32 +0,0 @@
-
-module ScoutApm
-  module Utils
-    module SqlRegex
-      MULTIPLE_SPACES    = %r|\s+|.freeze
-      MULTIPLE_QUESTIONS = /\?(,\?)+/.freeze
-
-      PSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*\z|.freeze
-      PSQL_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze
-      PSQL_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
-      PSQL_PLACEHOLDER = /\$\d+/.freeze
-      PSQL_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
-      PSQL_AFTER_WHERE = /(?:WHERE\s+).*?(?:SELECT|\z)/im.freeze
-      PSQL_AFTER_SET = /(?:SET\s+).*?(?:WHERE|\z)/im.freeze
-
-      MYSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
-      MYSQL_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
-      MYSQL_REMOVE_SINGLE_QUOTE_STRINGS = %r{'(?:\\'|[^']|'')*'}.freeze
-      MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS = %r{"(?:\\"|[^"]|"")*"}.freeze
-      MYSQL_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
-
-      SQLITE_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
-      SQLITE_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze
-      SQLITE_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
-
-      # => "EXEC sp_executesql N'SELECT  [users].* FROM [users] WHERE (age > 50)  ORDER BY [users].[id] ASC OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY', N'@0 int', @0 = 10"
-      SQLSERVER_EXECUTESQL = /EXEC sp_executesql N'(.*?)'.*/
-      SQLSERVER_REMOVE_INTEGERS = /(?<!LIMIT )\b(?<!@)\d+\b/.freeze
-      SQLSERVER_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
-    end
-  end
-end

data/lib/scout_apm/utils/sql_sanitizer_regex_1_8_7.rb

@@ -1,32 +0,0 @@
-
-module ScoutApm
-  module Utils
-    module SqlRegex
-      MULTIPLE_SPACES    = %r|\s+|.freeze
-      MULTIPLE_QUESTIONS = /\?(,\?)+/.freeze
-
-      PSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
-      PSQL_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze
-      PSQL_REMOVE_INTEGERS = /\b\d+\b/.freeze
-      PSQL_PLACEHOLDER = /\$\d+/.freeze
-      PSQL_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
-      PSQL_AFTER_WHERE = /(?:WHERE\s+).*?(?:SELECT|$)/i.freeze
-      PSQL_AFTER_SET = /(?:SET\s+).*?(?:WHERE|$)/i.freeze
-
-      MYSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
-      MYSQL_REMOVE_INTEGERS = /\b\d+\b/.freeze
-      MYSQL_REMOVE_SINGLE_QUOTE_STRINGS = /'(?:\\'|[^']|'')*'/.freeze
-      MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS = /"(?:\\"|[^"]|"")*"/.freeze
-      MYSQL_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
-
-      SQLITE_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
-      SQLITE_REMOVE_STRINGS = /'(?:[^']|'')*'/.freeze
-      SQLITE_REMOVE_INTEGERS = /\b\d+\b/.freeze
-
-      # This is not officially supported, but will do its best.
-      SQLSERVER_EXECUTESQL = /EXEC sp_executesql N'(.*?)'.*/
-      SQLSERVER_REMOVE_INTEGERS = /\b\d+\b/.freeze
-      SQLSERVER_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
-    end
-  end
-end